patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 69da467..23ae50c 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1210,6 +1210,39 @@ config IBMVETH
          <file:Documentation/networking/net-modules.txt>. The module will
          be called ibmveth.
 
+config IBM_EMAC
+       tristate "IBM PPC4xx EMAC driver support"
+       depends on 4xx
+       ---help---
+       This driver supports the IBM PPC4xx EMAC family of on-chip
+       Ethernet controllers.
+
+config IBM_EMAC_ERRMSG
+       bool "Verbose error messages"
+       depends on IBM_EMAC
+
+config IBM_EMAC_RXB
+       int "Number of receive buffers"
+       depends on IBM_EMAC
+       default "128" if IBM_EMAC4
+       default "64"
+
+config IBM_EMAC_TXB
+       int "Number of transmit buffers"
+       depends on IBM_EMAC
+       default "128" if IBM_EMAC4
+       default "8"
+
+config IBM_EMAC_FGAP
+       int "Frame gap"
+       depends on IBM_EMAC
+       default "8"
+
+config IBM_EMAC_SKBRES
+       int "Skb reserve amount"
+       depends on IBM_EMAC
+       default "0"
+
 config NET_PCI
        bool "EISA, VLB, PCI and on board controllers"
        depends on NET_ETHERNET && (ISA || EISA || PCI)
@@ -1828,6 +1861,13 @@ config FEC
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on the Motorola ColdFire 5272 processor.
 
+config NE_H8300
+       tristate "NE2000 compatible support for H8/300"
+       depends on H8300 && NET_ETHERNET
+       help
+         Say Y here if you want to use the NE2000 compatible
+         controller on the Renesas H8/300 processor.
+
 endmenu
 
 #
@@ -2480,16 +2520,6 @@ config IPHASE5526
          To compile this driver as a module, choose M here: the module
          will be called iph5526.
 
-config RCPCI
-       tristate "Red Creek Hardware VPN (EXPERIMENTAL)"
-       depends on NETDEVICES && EXPERIMENTAL && PCI && !64BIT
-       help
-         This is a driver for hardware which provides a Virtual Private
-         Network (VPN). Say Y if you have it.
-
-         To compile this driver as a module, choose M here: the module
-         will be called rcpci.
-
 config SHAPER
        tristate "Traffic Shaper (EXPERIMENTAL)"
        depends on NETDEVICES && EXPERIMENTAL