Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

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

diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index bcbb650..dcefedc 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
@@ -14,12 +10,36 @@ config ISDN_DRV_GIGASET
          If you have one of these devices, say M here and for at least
          one of the connection specific parts that follow.
          This will build a module called "gigaset".
+         Note: If you build your ISDN subsystem (ISDN_CAPI or ISDN_I4L)
+         as a module, you have to build this driver as a module too,
+         otherwise the Gigaset device won't show up as an ISDN device.
+
+if ISDN_DRV_GIGASET
+
+config GIGASET_CAPI
+       bool "Gigaset CAPI support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       depends on ISDN_CAPI='y'||(ISDN_CAPI='m'&&ISDN_DRV_GIGASET='m')
+       default ISDN_I4L='n'
+       help
+         Build the Gigaset driver as a CAPI 2.0 driver interfacing with
+         the Kernel CAPI subsystem. To use it with the old ISDN4Linux
+         subsystem you'll have to enable the capidrv glue driver.
+         (select ISDN_CAPI_CAPIDRV.)
+         Say N to build the old native ISDN4Linux variant.
 
-if ISDN_DRV_GIGASET!=n
+config GIGASET_I4L
+       bool
+       depends on ISDN_I4L='y'||(ISDN_I4L='m'&&ISDN_DRV_GIGASET='m')
+       default !GIGASET_CAPI
+
+config GIGASET_DUMMYLL
+       bool
+       default !GIGASET_CAPI&&!GIGASET_I4L
 
 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 +47,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 +55,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.
@@ -47,14 +66,4 @@ config GIGASET_DEBUG
          This enables debugging code in the Gigaset drivers.
          If in doubt, say yes.
 
-config GIGASET_UNDOCREQ
-       bool "Support for undocumented USB requests"
-       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
-
-endmenu
+endif # ISDN_DRV_GIGASET