Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds...

[linux-2.6] / drivers / isdn / gigaset / Kconfig

diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index bcbb650..9ca889a 100644 (file)
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -1,9 +1,5 @@
-menu "Siemens Gigaset"
-       depends on ISDN_I4L
-
-config ISDN_DRV_GIGASET
-       tristate "Siemens Gigaset support (isdn)"
-       depends on ISDN_I4L
+menuconfig ISDN_DRV_GIGASET
+       tristate "Siemens Gigaset support"
        select CRC_CCITT
        select BITREVERSE
        help
@@ -15,11 +11,11 @@ config ISDN_DRV_GIGASET
          one of the connection specific parts that follow.
          This will build a module called "gigaset".
 
-if ISDN_DRV_GIGASET!=n
+if ISDN_DRV_GIGASET
 
 config GIGASET_BASE
        tristate "Gigaset base station support"
-       depends on ISDN_DRV_GIGASET && USB
+       depends on USB
        help
          Say M here if you want to use the USB interface of the Gigaset
          base for connection to your system.
@@ -27,7 +23,7 @@ config GIGASET_BASE
 
 config GIGASET_M105
        tristate "Gigaset M105 support"
-       depends on ISDN_DRV_GIGASET && USB
+       depends on USB
        help
          Say M here if you want to connect to the Gigaset base via DECT
          using a Gigaset M105 (Sinus 45 Data 2) USB DECT device.
@@ -35,7 +31,6 @@ config GIGASET_M105
 
 config GIGASET_M101
        tristate "Gigaset M101 support"
-       depends on ISDN_DRV_GIGASET
        help
          Say M here if you want to connect to the Gigaset base via DECT
          using a Gigaset M101 (Sinus 45 Data 1) RS232 DECT device.
@@ -52,9 +47,6 @@ config GIGASET_UNDOCREQ
        help
          This enables support for USB requests we only know from
          reverse engineering (currently M105 only). If you need
-         features like configuration mode of M105, say yes. If you
-         care about your device, say no.
-
-endif
+         features like configuration mode of M105, say yes.
 
-endmenu
+endif # ISDN_DRV_GIGASET