diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:19:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:19:41 -0700 |
| commit | 5c7c204aeca51ccfad63caab4fcdc5d8026c0fd8 (patch) | |
| tree | 4bfd5f4455b706c9ba86a8925bf367f437d16336 /drivers/isdn/Kconfig | |
| parent | 228428428138e231a155464239880201e5cc8b44 (diff) | |
| parent | 3712b42d4b1bec29a4232a6673bf2e6dcc5faa68 (diff) | |
| download | kernel_samsung_aries-5c7c204aeca51ccfad63caab4fcdc5d8026c0fd8.zip kernel_samsung_aries-5c7c204aeca51ccfad63caab4fcdc5d8026c0fd8.tar.gz kernel_samsung_aries-5c7c204aeca51ccfad63caab4fcdc5d8026c0fd8.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Add layer1 over IP support
Add mISDN HFC multiport driver
Add mISDN HFC PCI driver
Add mISDN DSP
Add mISDN core files
Define AF_ISDN and PF_ISDN
Add mISDN driver
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 66f946a..3d113c6 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -3,7 +3,7 @@ # menuconfig ISDN - tristate "ISDN support" + bool "ISDN support" depends on NET depends on !S390 ---help--- @@ -21,6 +21,8 @@ menuconfig ISDN if ISDN +source "drivers/isdn/mISDN/Kconfig" + menuconfig ISDN_I4L tristate "Old ISDN4Linux (deprecated)" ---help--- |