Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5148d47492a0c1b90eb225826ff85ea0a0c046f9..fee8c5cf1f3a8e9ab1c25becaafaba3d4d0c4a22 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1338,7 +1338,7 @@ config FORCEDETH
 
 config CS89x0
        tristate "CS89x0 support"
 
 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
        ---help---
          Support for CS89x0 chipset based Ethernet cards. If you have a
          network (Ethernet) card of this type, say Y and read the