ipg: missing Kconfig dependency

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ce34b539bf38e7f12f4ab638f15f7088ab482e0c..9f7ec7df475e2690581feabf39094a82d4288350 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -168,6 +168,7 @@ config NET_SB1000
 config IP1000
        tristate "IP1000 Gigabit Ethernet support"
        depends on PCI && EXPERIMENTAL
+       select MII
        ---help---
          This driver supports IP1000 gigabit Ethernet cards.
 
@@ -2371,13 +2372,16 @@ config UGETH_TX_ON_DEMAND
        depends on UCC_GETH
 
 config MV643XX_ETH
-       tristate "MV-643XX Ethernet support"
-       depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32)
+       tristate "Marvell Discovery (643XX) and Orion ethernet support"
+       depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || ARCH_ORION
        select MII
        help
-         This driver supports the gigabit Ethernet on the Marvell MV643XX
-         chipset which is used in the Momenco Ocelot C and Jaguar ATX and
-         Pegasos II, amongst other PPC and MIPS boards.
+         This driver supports the gigabit ethernet MACs in the
+         Marvell Discovery PPC/MIPS chipset family (MV643XX) and
+         in the Marvell Orion ARM SoC family.
+
+         Some boards that use the Discovery chipset are the Momenco
+         Ocelot C and Jaguar ATX and Pegasos II.
 
 config QLA3XXX
        tristate "QLogic QLA3XXX Network Driver Support"
@@ -3100,4 +3104,10 @@ config NETPOLL_TRAP
 config NET_POLL_CONTROLLER
        def_bool NETPOLL
 
+config VIRTIO_NET
+       tristate "Virtio network driver (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && VIRTIO
+       ---help---
+         This is the virtual network driver for lguest.  Say Y or M.
+
 endif # NETDEVICES