aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2008-12-27 23:43:48 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-27 23:43:48 -0500
commiteb56092fc168bf5af199d47af50c0d84a96db898 (patch)
tree0023c2699366dc1dc2239ddc0fd716866f0ee489
parent8d25332081d87491e3b12fa130539fe9e2ba4a94 (diff)
net: Allow dependancies of FDDI & Tokenring to be modular.
I noticed it isn't possible to build token ring & fddi drivers without causing LLC, and a bunch of other things to be forced built-in. For distro kernels, this means carrying a chunk of code in the vmlinuz, even if the user doesn't use those protocols. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/tokenring/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index adb4073ce151..72a9212da865 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2650,7 +2650,7 @@ config RIONET_RX_SIZE
2650 default "128" 2650 default "128"
2651 2651
2652config FDDI 2652config FDDI
2653 bool "FDDI driver support" 2653 tristate "FDDI driver support"
2654 depends on (PCI || EISA || TC) 2654 depends on (PCI || EISA || TC)
2655 help 2655 help
2656 Fiber Distributed Data Interface is a high speed local area network 2656 Fiber Distributed Data Interface is a high speed local area network
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index e6b2e06493e7..c4137b0f808e 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -4,7 +4,7 @@
4 4
5# So far, we only have PCI, ISA, and MCA token ring devices 5# So far, we only have PCI, ISA, and MCA token ring devices
6menuconfig TR 6menuconfig TR
7 bool "Token Ring driver support" 7 tristate "Token Ring driver support"
8 depends on NETDEVICES && !UML 8 depends on NETDEVICES && !UML
9 depends on (PCI || ISA || MCA || CCW) 9 depends on (PCI || ISA || MCA || CCW)
10 select LLC 10 select LLC