aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-01-08 01:01:13 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:12:46 -0800
commit37610ff3cb63f59b89370681ff780687d8a7bed3 (patch)
tree3bc3e49f946cb0baed2a0dcdcc0ac05ad2471d4b
parent084f746a01ca026920e388e76e913cc7a26d5a3f (diff)
downloadkernel_samsung_aries-37610ff3cb63f59b89370681ff780687d8a7bed3.zip
kernel_samsung_aries-37610ff3cb63f59b89370681ff780687d8a7bed3.tar.gz
kernel_samsung_aries-37610ff3cb63f59b89370681ff780687d8a7bed3.tar.bz2
[PATCH] fix Kconfig depends for cs89x0 (PNX010X support)
PNX010X support for CS89x0 should be conditional on NET_PCI, as it is an 'on board controller' and NET_PCI includes that category of NICs. Since ARCH_PNX0105 was recently changed to ARCH_PNX010X, incorporate that change as well while we're at it. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Cc: dmitry pervushin <dpervushin@ru.mvista.com> Cc: <dsaxena@plexity.net> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e2fa29b..1960961 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1374,7 +1374,7 @@ config FORCEDETH
config CS89x0
tristate "CS89x0 support"
- depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105
+ depends on NET_PCI && (ISA || ARCH_IXDP2X01 || ARCH_PNX010X)
---help---
Support for CS89x0 chipset based Ethernet cards. If you have a
network (Ethernet) card of this type, say Y and read the