diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-03-17 22:40:50 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-03-17 22:40:50 -0400 |
| commit | 688d794c4c3f8b08c814381ee2edd3ede5856056 (patch) | |
| tree | ef680add71e2a9588d07d8b594edbc1b5cd127d7 /net/lapb | |
| parent | 16142655269aaf580488e074eabfdcf0fb4e3687 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge tag 'v3.9-rc3' into next
Merge with mainline to bring in module_platform_driver_probe() and
devm_ioremap_resource().
Diffstat (limited to 'net/lapb')
| -rw-r--r-- | net/lapb/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/lapb/Kconfig b/net/lapb/Kconfig index f0b5efb31a00..6481839b76c9 100644 --- a/net/lapb/Kconfig +++ b/net/lapb/Kconfig | |||
| @@ -3,8 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | config LAPB | 5 | config LAPB |
| 6 | tristate "LAPB Data Link Driver (EXPERIMENTAL)" | 6 | tristate "LAPB Data Link Driver" |
| 7 | depends on EXPERIMENTAL | ||
| 8 | ---help--- | 7 | ---help--- |
| 9 | Link Access Procedure, Balanced (LAPB) is the data link layer (i.e. | 8 | Link Access Procedure, Balanced (LAPB) is the data link layer (i.e. |
| 10 | the lower) part of the X.25 protocol. It offers a reliable | 9 | the lower) part of the X.25 protocol. It offers a reliable |