aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@linux01.gwdg.de>2007-07-15 23:39:31 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 09:05:40 -0700
commit79e508a4b8f405f9c9c3dbbd19d84717f42431ef (patch)
treec73b97c4236120770e623401e2baf1f9e950cef6
parent2a07c8f9cd3bf3af37595d2692cbcf50f42d4819 (diff)
downloadkernel_samsung_smdk4412-79e508a4b8f405f9c9c3dbbd19d84717f42431ef.zip
kernel_samsung_smdk4412-79e508a4b8f405f9c9c3dbbd19d84717f42431ef.tar.gz
kernel_samsung_smdk4412-79e508a4b8f405f9c9c3dbbd19d84717f42431ef.tar.bz2
Use menuconfig objects II - Telephony
Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/telephony/Kconfig12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig
index dd1d6a5..8f530e6 100644
--- a/drivers/telephony/Kconfig
+++ b/drivers/telephony/Kconfig
@@ -2,11 +2,9 @@
# Telephony device configuration
#
-menu "Telephony Support"
+menuconfig PHONE
+ tristate "Telephony support"
depends on HAS_IOMEM
-
-config PHONE
- tristate "Linux telephony support"
---help---
Say Y here if you have a telephony card, which for example allows
you to use a regular phone for voice-over-IP applications.
@@ -17,9 +15,10 @@ config PHONE
To compile this driver as a module, choose M here: the
module will be called phonedev.
+if PHONE
+
config PHONE_IXJ
tristate "QuickNet Internet LineJack/PhoneJack support"
- depends on PHONE
---help---
Say M if you have a telephony card manufactured by Quicknet
Technologies, Inc. These include the Internet PhoneJACK and
@@ -44,5 +43,4 @@ config PHONE_IXJ_PCMCIA
cards manufactured by Quicknet Technologies, Inc. This changes the
card initialization code to work with the card manager daemon.
-endmenu
-
+endif # PHONE