Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353691
b: refs/heads/master
c: 8aa53cb
h: refs/heads/master
i:
  353689: b5a480f
  353687: 6ffc11d
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 22, 2013
1 parent 14774a9 commit 5ea825e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 91d09454b146e986d917e638781f3e759c6647f6
refs/heads/master: 8aa53cb3a5469868fc0145e9aaf4ac3847aad5c4
20 changes: 10 additions & 10 deletions trunk/drivers/net/ppp/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ config PPP_FILTER
If unsure, say N.

config PPP_MPPE
tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
depends on PPP && EXPERIMENTAL
tristate "PPP MPPE compression (encryption)"
depends on PPP
select CRYPTO
select CRYPTO_SHA1
select CRYPTO_ARC4
Expand All @@ -96,8 +96,8 @@ config PPP_MPPE
configuring PPTP clients and servers to utilize this method.

config PPP_MULTILINK
bool "PPP multilink support (EXPERIMENTAL)"
depends on PPP && EXPERIMENTAL
bool "PPP multilink support"
depends on PPP
---help---
PPP multilink is a protocol (defined in RFC 1990) which allows you
to combine several (logical or physical) lines into one logical PPP
Expand All @@ -118,8 +118,8 @@ config PPPOATM
changes its encapsulation unilaterally.

config PPPOE
tristate "PPP over Ethernet (EXPERIMENTAL)"
depends on EXPERIMENTAL && PPP
tristate "PPP over Ethernet"
depends on PPP
---help---
Support for PPP over Ethernet.

Expand All @@ -130,8 +130,8 @@ config PPPOE
the heading "Kernel mode PPPoE").

config PPTP
tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
tristate "PPP over IPv4 (PPTP)"
depends on PPP && NET_IPGRE_DEMUX
---help---
Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)

Expand All @@ -141,8 +141,8 @@ config PPTP
utilize this module.

config PPPOL2TP
tristate "PPP over L2TP (EXPERIMENTAL)"
depends on EXPERIMENTAL && L2TP && PPP
tristate "PPP over L2TP"
depends on L2TP && PPP
---help---
Support for PPP-over-L2TP socket family. L2TP is a protocol
used by ISPs and enterprises to tunnel PPP traffic over UDP
Expand Down

0 comments on commit 5ea825e

Please sign in to comment.