1 files changed, 15 insertions, 3 deletions

diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index 6fd2dc1e97fb..dcefedc7044a 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -10,20 +10,32 @@ menuconfig 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 the ISDN4Linux subsystem (ISDN_I4L)
+          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.
+
 config GIGASET_I4L
         bool
         depends on ISDN_I4L='y'||(ISDN_I4L='m'&&ISDN_DRV_GIGASET='m')
-        default y
+        default !GIGASET_CAPI
 
 config GIGASET_DUMMYLL
         bool
-        default !GIGASET_I4L
+        default !GIGASET_CAPI&&!GIGASET_I4L
 
 config GIGASET_BASE
         tristate "Gigaset base station support"