Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 77efe46..77c1fab 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -180,6 +180,13 @@ config NET_SB1000
 
 source "drivers/net/arcnet/Kconfig"
 
+config MII
+       tristate "Generic Media Independent Interface device support"
+       help
+         Most ethernet controllers have MII transceiver either as an external
+         or internal device.  It is safe to say Y or M here even if your
+         ethernet card lacks MII.
+
 source "drivers/net/phy/Kconfig"
 
 #
@@ -215,13 +222,6 @@ menuconfig NET_ETHERNET
 
 if NET_ETHERNET
 
-config MII
-       tristate "Generic Media Independent Interface device support"
-       help
-         Most ethernet controllers have MII transceiver either as an external
-         or internal device.  It is safe to say Y or M here even if your
-         ethernet card lack MII.
-
 config MACB
        tristate "Atmel MACB support"
        depends on HAVE_NET_MACB
@@ -924,7 +924,7 @@ config SMC91X
          including the SMC91C94 and the SMC91C111. Say Y if you want it
          compiled into the kernel, and read the file
          <file:Documentation/networking/smc9.txt>  and the Ethernet-HOWTO,
-         available from  <http://www.linuxdoc.org/docs.html#howto>.
+         available from  <http://www.tldp.org/docs.html#howto>.
 
          This driver is also available as a module ( = code which can be
          inserted in and removed from the running kernel whenever you want).
@@ -1034,7 +1034,7 @@ config SMC911X
          including the new LAN9115, LAN9116, LAN9117, and LAN9118.
          Say Y if you want it compiled into the kernel, 
          and read the Ethernet-HOWTO, available from
-         <http://www.linuxdoc.org/docs.html#howto>.
+         <http://www.tldp.org/docs.html#howto>.
 
          This driver is also available as a module. The module will be 
          called smc911x.  If you want to compile it as a module, say M 
@@ -1516,7 +1516,7 @@ config E100
 
          For the latest Intel PRO/100 network driver for Linux, see:
 
-         <http://appsr.intel.com/scripts-df/support_intel.asp>
+         <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
 
          More specific information on configuring the driver is in 
          <file:Documentation/networking/e100.txt>.
@@ -1542,9 +1542,8 @@ config FEALNX
        select CRC32
        select MII
        help
-         Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet
-         cards. Specifications and data at
-         <http://www.myson.com.hk/mtd/datasheet/>.
+         Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
+         cards. <http://www.myson.com.tw/>
 
 config NATSEMI
        tristate "National Semiconductor DP8381x series PCI Ethernet support"
@@ -1718,7 +1717,7 @@ config SMSC9420
          This is a driver for SMSC's LAN9420 PCI ethernet adapter.
          Say Y if you want it compiled into the kernel,
          and read the Ethernet-HOWTO, available from
-         <http://www.linuxdoc.org/docs.html#howto>.
+         <http://www.tldp.org/docs.html#howto>.
 
          This driver is also available as a module. The module will be
          called smsc9420.  If you want to compile it as a module, say M
@@ -2518,6 +2517,18 @@ config S6GMAC
 
 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
 
 #
@@ -2553,7 +2564,7 @@ config CHELSIO_T1
           our website at <http://www.chelsio.com>.
 
           For customer support, please visit our customer support page at
-          <http://www.chelsio.com/support.htm>.
+          <http://www.chelsio.com/support.html>.
 
           Please send feedback to <linux-bugs@chelsio.com>.
 
@@ -2585,7 +2596,7 @@ config CHELSIO_T3
          our website at <http://www.chelsio.com>.
 
          For customer support, please visit our customer support page at
-         <http://www.chelsio.com/support.htm>.
+         <http://www.chelsio.com/support.html>.
 
          Please send feedback to <linux-bugs@chelsio.com>.
 
@@ -2610,7 +2621,7 @@ config CHELSIO_T4
          our website at <http://www.chelsio.com>.
 
          For customer support, please visit our customer support page at
-         <http://www.chelsio.com/support.htm>.
+         <http://www.chelsio.com/support.html>.
 
          Please send feedback to <linux-bugs@chelsio.com>.
 
@@ -2633,7 +2644,7 @@ config CHELSIO_T4VF
          our website at <http://www.chelsio.com>.
 
          For customer support, please visit our customer support page at
-         <http://www.chelsio.com/support.htm>.
+         <http://www.chelsio.com/support.html>.
 
          Please send feedback to <linux-bugs@chelsio.com>.
 
@@ -2872,6 +2883,20 @@ config 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"
@@ -3205,6 +3230,17 @@ config 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