diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /drivers/isdn/Kconfig | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/isdn/Kconfig')
| -rw-r--r-- | drivers/isdn/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index 66f946aa30b3..3d113c6e4a70 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menuconfig ISDN | 5 | menuconfig ISDN |
| 6 | tristate "ISDN support" | 6 | bool "ISDN support" |
| 7 | depends on NET | 7 | depends on NET |
| 8 | depends on !S390 | 8 | depends on !S390 |
| 9 | ---help--- | 9 | ---help--- |
| @@ -21,6 +21,8 @@ menuconfig ISDN | |||
| 21 | 21 | ||
| 22 | if ISDN | 22 | if ISDN |
| 23 | 23 | ||
| 24 | source "drivers/isdn/mISDN/Kconfig" | ||
| 25 | |||
| 24 | menuconfig ISDN_I4L | 26 | menuconfig ISDN_I4L |
| 25 | tristate "Old ISDN4Linux (deprecated)" | 27 | tristate "Old ISDN4Linux (deprecated)" |
| 26 | ---help--- | 28 | ---help--- |