Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

[firefly-linux-kernel-4.4.55.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
old mode 100644 (file)
new mode 100755 (executable)
index 0c3f234..0a47cad
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -251,6 +251,16 @@ config AX88796_93CX6
        help
          Select this if your platform comes with an external 93CX6 eeprom.
 
+config RK29_VMAC
+       tristate "RK29 VMAC ethernet support"
+       depends on HAS_DMA
+       select MII
+       select PHYLIB
+       select CRC32
+       help
+         MAC device present on rockchip rk29xx 
+
+
 config MACE
        tristate "MACE (Power Mac ethernet) support"
        depends on PPC_PMAC && PPC32
@@ -993,6 +1003,17 @@ config DM9000_DEBUGLEVEL
          The maximum level of debugging code compiled into the DM9000
          driver.
 
+if DM9000
+choice
+  prompt "choose control"
+       config DM9000_USE_NAND_CONTROL
+               tristate "DM9000 with NANDC Interface"
+
+       config DM9000_USE_NOR_CONTROL
+               tristate  "DM9000 with NOR Interface"
+endchoice
+endif
+         
 config DM9000_FORCE_SIMPLE_PHY_POLL
        bool "Force simple NSR based PHY polling"
        depends on DM9000
@@ -3324,6 +3345,23 @@ config PPPOL2TP
          used by ISPs and enterprises to tunnel PPP traffic over UDP
          tunnels. L2TP is replacing PPTP for VPN uses.
 
+config PPPOLAC
+       tristate "PPP on L2TP Access Concentrator"
+       depends on PPP && INET
+       help
+         L2TP (RFC 2661) is a tunneling protocol widely used in virtual private
+         networks. This driver handles L2TP data packets between a UDP socket
+         and a PPP channel, but only permits one session per socket. Thus it is
+         fairly simple and suited for clients.
+
+config PPPOPNS
+       tristate "PPP on PPTP Network Server"
+       depends on PPP && INET
+       help
+         PPTP (RFC 2637) is a tunneling protocol widely used in virtual private
+         networks. This driver handles PPTP data packets between a RAW socket
+         and a PPP channel. It is fairly simple and easy to use.
+
 config SLIP
        tristate "SLIP (serial line) support"
        ---help---