[kernel] r18309 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series

[Ben Hutchings]

Author: benh
Date: Tue Nov 22 07:56:06 2011
New Revision: 18309

Log:
netdev: Revert ARCNET and PHYLIB to tristate options

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/netdev-Revert-ARCNET-and-PHYLIB-to-tristate-options.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/netdev-Revert-ARCNET-and-PHYLIB-to-tristate-options.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/netdev-Revert-ARCNET-and-PHYLIB-to-tristate-options.patch	Tue Nov 22 07:56:06 2011	(r18309)
@@ -0,0 +1,44 @@
+From ed27850db5bec21b1804ed326691af575bdfbd23 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 22 Nov 2011 06:55:26 +0000
+Subject: [PATCH] netdev: Revert ARCNET and PHYLIB to tristate options
+
+commit 88491d8103498a6166f70d5999902fec70924314 ("drivers/net: Kconfig
+& Makefile cleanup") changed the type of these options to bool, but
+they select code that could (and still can) be built as modules.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/net/arcnet/Kconfig |    2 +-
+ drivers/net/phy/Kconfig    |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig
+index a73d9dc..84fb634 100644
+--- a/drivers/net/arcnet/Kconfig
++++ b/drivers/net/arcnet/Kconfig
+@@ -4,7 +4,7 @@
+ 
+ menuconfig ARCNET
+ 	depends on NETDEVICES && (ISA || PCI || PCMCIA)
+-	bool "ARCnet support"
++	tristate "ARCnet support"
+ 	---help---
+ 	  If you have a network card of this type, say Y and check out the
+ 	  (arguably) beautiful poetry in
+diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
+index bb88e12..a702443 100644
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -3,7 +3,7 @@
+ #
+ 
+ menuconfig PHYLIB
+-	bool "PHY Device support and infrastructure"
++	tristate "PHY Device support and infrastructure"
+ 	depends on !S390
+ 	depends on NETDEVICES
+ 	help
+-- 
+1.7.7.3
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Tue Nov 22 06:40:56 2011	(r18308)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Tue Nov 22 07:56:06 2011	(r18309)
@@ -47,3 +47,4 @@
 # Defer until we're sure about the system call number
 #+ bugfix/ia64/ia64-Add-accept4-syscall.patch
 + bugfix/arm/ixp4xx_iobe.patch
++ bugfix/all/netdev-Revert-ARCNET-and-PHYLIB-to-tristate-options.patch