5 files changed, 59 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4e8fbbc5566d..e09341698025 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1039,6 +1039,15 @@ M:	khc@pm.waw.pl
 W:      http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:      Maintained
 
+GIGASET ISDN DRIVERS
+P:      Hansjoerg Lipp
+M:      hjlipp@web.de
+P:      Tilman Schmidt
+M:      tilman@imap.cc
+L:      gigaset307x-common@lists.sourceforge.net
+W:      http://gigaset307x.sourceforge.net/
+S:      Maintained
+
 HARDWARE MONITORING
 P:      Jean Delvare
 M:      khali@linux-fr.org
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index 03d8ccd51955..988142c30a6d 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_ISDN_DRV_SC)		+= sc/
 obj-$(CONFIG_ISDN_DRV_LOOP)             += isdnloop/
 obj-$(CONFIG_ISDN_DRV_ACT2000)          += act2000/
 obj-$(CONFIG_HYSDN)                     += hysdn/
+obj-$(CONFIG_ISDN_DRV_GIGASET)          += gigaset/
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
new file mode 100644
index 000000000000..53c4fb62ed85
--- /dev/null
+++ b/drivers/isdn/gigaset/Kconfig
@@ -0,0 +1,42 @@
+menu "Siemens Gigaset"
+        depends on ISDN_I4L
+
+config ISDN_DRV_GIGASET
+        tristate "Siemens Gigaset support (isdn)"
+        depends on ISDN_I4L && m
+#       depends on ISDN_I4L && MODULES
+        help
+          Say m here if you have a Gigaset or Sinus isdn device.
+
+if ISDN_DRV_GIGASET!=n
+
+config GIGASET_BASE
+        tristate "Gigaset base station support"
+        depends on ISDN_DRV_GIGASET && USB
+        help
+          Say m here if you need to communicate with the base
+          directly via USB.
+
+config GIGASET_M105
+        tristate "Gigaset M105 support"
+        depends on ISDN_DRV_GIGASET && USB
+        help
+          Say m here if you need the driver for the Gigaset M105 device.
+
+config GIGASET_DEBUG
+        bool "Gigaset debugging"
+        help
+          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
diff --git a/drivers/isdn/gigaset/Makefile b/drivers/isdn/gigaset/Makefile
new file mode 100644
index 000000000000..9b9acf1a21ad
--- /dev/null
+++ b/drivers/isdn/gigaset/Makefile
@@ -0,0 +1,6 @@
+gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o
+usb_gigaset-y := usb-gigaset.o asyncdata.o
+bas_gigaset-y := bas-gigaset.o isocdata.o
+
+obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o
+obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.o
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
index 1789b607f090..a4f7288a1fc8 100644
--- a/drivers/isdn/i4l/Kconfig
+++ b/drivers/isdn/i4l/Kconfig
@@ -139,3 +139,4 @@ source "drivers/isdn/hysdn/Kconfig"
 
 endmenu
 
+source "drivers/isdn/gigaset/Kconfig"