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>

diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig
index dd1d6a53f3c084f0b5a2cc49d27ee27da3fafb0c..8f530e68263bd31fb8f80ce2be5660de6b2733a9 100644 (file)
--- 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