diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /drivers/isdn/Kconfig | |
parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
download | talos-obmc-linux-b981d8b3f5e008ff10d993be633ad00564fc22cd.tar.gz talos-obmc-linux-b981d8b3f5e008ff10d993be633ad00564fc22cd.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'drivers/isdn/Kconfig')
-rw-r--r-- | drivers/isdn/Kconfig | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index cf906c8cee4d..66f946aa30b3 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -21,9 +21,7 @@ menuconfig ISDN if ISDN -menu "Old ISDN4Linux" - -config ISDN_I4L +menuconfig ISDN_I4L tristate "Old ISDN4Linux (deprecated)" ---help--- This driver allows you to use an ISDN adapter for networking @@ -45,12 +43,8 @@ if ISDN_I4L source "drivers/isdn/i4l/Kconfig" endif -endmenu - -comment "CAPI subsystem" - -config ISDN_CAPI - tristate "CAPI2.0 support" +menuconfig ISDN_CAPI + tristate "CAPI 2.0 subsystem" help This provides the CAPI (Common ISDN Application Programming Interface, a standard making it easy for programs to access ISDN |