diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-01 11:47:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-01 11:47:44 -0400 |
| commit | bf61c8840efe60fd8f91446860b63338fb424158 (patch) | |
| tree | 7a71832407a4f0d6346db773343f4c3ae2257b19 /net/lapb | |
| parent | 5846115b30f3a881e542c8bfde59a699c1c13740 (diff) | |
| parent | 0c6a61657da78098472fd0eb71cc01f2387fa1bb (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.10 merge window.
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 |