summaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-29 03:32:01 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-10-29 03:32:01 +0200
commit5615ca7906aefbdc3318604c89db5931d0a25910 (patch)
treec34bcc7e314f49005ad88ac84c908128729c0329 /drivers/net/Kconfig
parentMerge branch 'master' (diff)
parentMerge branch 'master' (diff)
downloadlinux-5615ca7906aefbdc3318604c89db5931d0a25910.tar.xz
linux-5615ca7906aefbdc3318604c89db5931d0a25910.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5148d47492a0..fee8c5cf1f3a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1338,7 +1338,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_PNX0105 || MACH_MP1000
---help---
Support for CS89x0 chipset based Ethernet cards. If you have a
network (Ethernet) card of this type, say Y and read the