Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5db667c0b3711f235dfc49c52a4d165b12e6b3fd..13d01f358f341ad60d6a3e2421c42c4b5ab1e0ed 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2515,6 +2515,18 @@ config S6GMAC
 
 source "drivers/net/stmmac/Kconfig"
 
 
 source "drivers/net/stmmac/Kconfig"
 

+config PCH_GBE
+       tristate "PCH Gigabit Ethernet"
+       depends on PCI
+       ---help---
+         This is a gigabit ethernet driver for Topcliff PCH.
+         Topcliff PCH is the platform controller hub that is used in Intel's
+         general embedded platform.
+         Topcliff PCH has Gigabit Ethernet interface.
+         Using this interface, it is able to access system devices connected
+         to Gigabit Ethernet.
+         This driver enables Gigabit Ethernet function.
+

 endif # NETDEV_1000
 
 #
 endif # NETDEV_1000
 
 #


@@ -2869,6 +2881,20 @@ config QLGE
          To compile this driver as a module, choose M here: the module
          will be called qlge.
 
          To compile this driver as a module, choose M here: the module
          will be called qlge.
 

+config BNA
+        tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
+        depends on PCI
+        ---help---
+          This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet
+          cards.
+          To compile this driver as a module, choose M here: the module
+          will be called bna.
+
+          For general information and support, go to the Brocade support
+          website at:
+
+          <http://support.brocade.com>
+

 source "drivers/net/sfc/Kconfig"
 
 source "drivers/net/benet/Kconfig"
 source "drivers/net/sfc/Kconfig"
 
 source "drivers/net/benet/Kconfig"


@@ -3202,6 +3228,17 @@ config PPPOE
          which contains instruction on how to use this driver (under 
          the heading "Kernel mode PPPoE").
 
          which contains instruction on how to use this driver (under 
          the heading "Kernel mode PPPoE").
 

+config PPTP
+       tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
+       help
+         Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
+
+         This driver requires pppd plugin to work in client mode or
+         modified pptpd (poptop) to work in server mode.
+         See http://accel-pptp.sourceforge.net/ for information how to
+         utilize this module.
+

 config PPPOATM
        tristate "PPP over ATM"
        depends on ATM && PPP
 config PPPOATM
        tristate "PPP over ATM"
        depends on ATM && PPP