1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f062b424704..16899eee397 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -974,7 +974,7 @@ config ENC28J60_WRITEVERIFY
 
 config ETHOC
         tristate "OpenCores 10/100 Mbps Ethernet MAC support"
-        depends on NET_ETHERNET
+        depends on NET_ETHERNET && HAS_IOMEM
         select MII
         select PHYLIB
         help
@@ -2547,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