diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a /net/lapb | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 (diff) | |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
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 |