Merge branch 'master'

[powerpc.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1958d9e..1579041 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -447,7 +447,7 @@ config NET_SB1250_MAC
 
 config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"
 
 config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"

-       depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN
+       depends on NET_ETHERNET && PCI && SGI_IP27

        select CRC32
        select MII
        help
        select CRC32
        select MII
        help


@@ -2008,7 +2008,25 @@ config SKGE
 
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.
 
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.

-       
+
+
+config SKY2
+       tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       ---help---
+         This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
+
+         To compile this driver as a module, choose M here: the module
+         will be called sky2.  This is recommended.
+
+config SKY2_EC_A1
+       bool "Support old Yukon-EC A1 chipset"
+       depends on SKY2
+       ---help---
+         Include support for early revisions of the Yukon EC chipset
+         that required extra workarounds. If in doubt, say N.
+

 config SK98LIN
        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
        depends on PCI
 config SK98LIN
        tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
        depends on PCI


@@ -2523,6 +2541,19 @@ config PPP_BSDCOMP
          module; it is called bsd_comp and will show up in the directory
          modules once you have said "make modules". If unsure, say N.
 
          module; it is called bsd_comp and will show up in the directory
          modules once you have said "make modules". If unsure, say N.
 

+config PPP_MPPE
+       tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
+       depends on PPP && EXPERIMENTAL
+       select CRYPTO
+       select CRYPTO_SHA1
+       select CRYPTO_ARC4
+       ---help---
+         Support for the MPPE Encryption protocol, as employed by the
+        Microsoft Point-to-Point Tunneling Protocol.
+
+        See http://pptpclient.sourceforge.net/ for information on
+        configuring PPTP clients and servers to utilize this method.
+

 config PPPOE
        tristate "PPP over Ethernet (EXPERIMENTAL)"
        depends on EXPERIMENTAL && PPP
 config PPPOE
        tristate "PPP over Ethernet (EXPERIMENTAL)"
        depends on EXPERIMENTAL && PPP