diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-02-02 16:58:05 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-02-02 16:58:05 +0800 |
| commit | 599a980adc5c2ba32f6aedcd87640b781d347d1f (patch) | |
| tree | 9163c58e47cf900303b6db19d2e6bd4468a43ecb /drivers/net/Kconfig | |
| parent | 203993cd89ec6395b6bfba948c2e424680dd622e (diff) | |
| parent | a65e28a0149261776678977962cfa0f90973e1d4 (diff) | |
Merge branch 'android-3.0' into imx_3.0.15_android
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/net/wireless/Makefile
kernel/power/main.c
sound/soc/soc-core.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index cec12046b8a7..d5e63b31d10f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -3346,6 +3346,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--- |