Merge branch 'topic/asoc' into for-linus

[mv-sheeva.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e5ffc1c606c19691f8fe200389747550555cece3..16899eee397ebf2d2c7e0a843e4a71174d04936b 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -972,6 +972,14 @@ config ENC28J60_WRITEVERIFY
          Enable the verify after the buffer write useful for debugging purpose.
          If unsure, say N.
 
+config ETHOC
+       tristate "OpenCores 10/100 Mbps Ethernet MAC support"
+       depends on NET_ETHERNET && HAS_IOMEM
+       select MII
+       select PHYLIB
+       help
+         Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+
 config SMC911X
        tristate "SMSC LAN911[5678] support"
        select CRC32
@@ -2539,6 +2547,23 @@ config S2IO
          More specific information on configuring the driver is in 
          <file:Documentation/networking/s2io.txt>.
 
+config VXGE
+       tristate "Neterion X3100 Series 10GbE PCIe Server Adapter"
+       depends on PCI && INET
+       ---help---
+         This driver supports Neterion Inc's X3100 Series 10 GbE PCIe
+         I/O Virtualized Server Adapter.
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/vxge.txt>.
+
+config VXGE_DEBUG_TRACE_ALL
+       bool "Enabling All Debug trace statments in driver"
+       default n
+       depends on VXGE
+       ---help---
+         Say Y here if you want to enabling all the debug trace statements in
+         driver. By  default only few debug trace statements are enabled.
+
 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
        depends on PCI && INET