aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 15:05:51 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 15:05:51 -0500
commit06991c28f37ad68e5c03777f5c3b679b56e3dac1 (patch)
tree4be75788e21c3c644fe6d39abf47693a171cf4f8 /drivers/net/ppp
parent460dc1eecf37263c8e3b17685ef236f0d236facb (diff)
parent74fef7a8fd1d2bd94f925d6638bb4c3049e7c381 (diff)
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman: "Here is the big driver core merge for 3.9-rc1 There are two major series here, both of which touch lots of drivers all over the kernel, and will cause you some merge conflicts: - add a new function called devm_ioremap_resource() to properly be able to check return values. - remove CONFIG_EXPERIMENTAL Other than those patches, there's not much here, some minor fixes and updates" Fix up trivial conflicts * tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits) base: memory: fix soft/hard_offline_page permissions drivercore: Fix ordering between deferred_probe and exiting initcalls backlight: fix class_find_device() arguments TTY: mark tty_get_device call with the proper const values driver-core: constify data for class_find_device() firmware: Ignore abort check when no user-helper is used firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER firmware: Make user-mode helper optional firmware: Refactoring for splitting user-mode helper code Driver core: treat unregistered bus_types as having no devices watchdog: Convert to devm_ioremap_resource() thermal: Convert to devm_ioremap_resource() spi: Convert to devm_ioremap_resource() power: Convert to devm_ioremap_resource() mtd: Convert to devm_ioremap_resource() mmc: Convert to devm_ioremap_resource() mfd: Convert to devm_ioremap_resource() media: Convert to devm_ioremap_resource() iommu: Convert to devm_ioremap_resource() drm: Convert to devm_ioremap_resource() ...
Diffstat (limited to 'drivers/net/ppp')
-rw-r--r--drivers/net/ppp/Kconfig20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
index 872df3ef07a6..278dea0c4c98 100644
--- a/drivers/net/ppp/Kconfig
+++ b/drivers/net/ppp/Kconfig
@@ -82,8 +82,8 @@ config PPP_FILTER
82 If unsure, say N. 82 If unsure, say N.
83 83
84config PPP_MPPE 84config PPP_MPPE
85 tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)" 85 tristate "PPP MPPE compression (encryption)"
86 depends on PPP && EXPERIMENTAL 86 depends on PPP
87 select CRYPTO 87 select CRYPTO
88 select CRYPTO_SHA1 88 select CRYPTO_SHA1
89 select CRYPTO_ARC4 89 select CRYPTO_ARC4
@@ -96,8 +96,8 @@ config PPP_MPPE
96 configuring PPTP clients and servers to utilize this method. 96 configuring PPTP clients and servers to utilize this method.
97 97
98config PPP_MULTILINK 98config PPP_MULTILINK
99 bool "PPP multilink support (EXPERIMENTAL)" 99 bool "PPP multilink support"
100 depends on PPP && EXPERIMENTAL 100 depends on PPP
101 ---help--- 101 ---help---
102 PPP multilink is a protocol (defined in RFC 1990) which allows you 102 PPP multilink is a protocol (defined in RFC 1990) which allows you
103 to combine several (logical or physical) lines into one logical PPP 103 to combine several (logical or physical) lines into one logical PPP
@@ -118,8 +118,8 @@ config PPPOATM
118 changes its encapsulation unilaterally. 118 changes its encapsulation unilaterally.
119 119
120config PPPOE 120config PPPOE
121 tristate "PPP over Ethernet (EXPERIMENTAL)" 121 tristate "PPP over Ethernet"
122 depends on EXPERIMENTAL && PPP 122 depends on PPP
123 ---help--- 123 ---help---
124 Support for PPP over Ethernet. 124 Support for PPP over Ethernet.
125 125
@@ -130,8 +130,8 @@ config PPPOE
130 the heading "Kernel mode PPPoE"). 130 the heading "Kernel mode PPPoE").
131 131
132config PPTP 132config PPTP
133 tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)" 133 tristate "PPP over IPv4 (PPTP)"
134 depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX 134 depends on PPP && NET_IPGRE_DEMUX
135 ---help--- 135 ---help---
136 Support for PPP over IPv4.(Point-to-Point Tunneling Protocol) 136 Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
137 137
@@ -141,8 +141,8 @@ config PPTP
141 utilize this module. 141 utilize this module.
142 142
143config PPPOL2TP 143config PPPOL2TP
144 tristate "PPP over L2TP (EXPERIMENTAL)" 144 tristate "PPP over L2TP"
145 depends on EXPERIMENTAL && L2TP && PPP 145 depends on L2TP && PPP
146 ---help--- 146 ---help---
147 Support for PPP-over-L2TP socket family. L2TP is a protocol 147 Support for PPP-over-L2TP socket family. L2TP is a protocol
148 used by ISPs and enterprises to tunnel PPP traffic over UDP 148 used by ISPs and enterprises to tunnel PPP traffic over UDP