From ea798ddad8cb9c1ff46e2b11c61ff7c9bfca495c Mon Sep 17 00:00:00 2001
From: Hansjoerg Lipp <hjlipp@web.de>
Date: Mon, 26 Jun 2006 00:25:35 -0700
Subject: [PATCH] --- yaml --- r: 30234 b: refs/heads/master c:
 5024ad4af69b3570e18d312786dc46318a1bad1a h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/fs/compat_ioctl.c            | 1 +
 trunk/include/linux/compat_ioctl.h | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9f5a0cc8f3f0..9839b967f8bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 698e3ed9d4f47286134f66ea333b6679b29e59e4
+refs/heads/master: 5024ad4af69b3570e18d312786dc46318a1bad1a
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index 9eb9824dd332..d8ecfedef189 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -80,6 +80,7 @@
 #include <net/bluetooth/rfcomm.h>
 
 #include <linux/capi.h>
+#include <linux/gigaset_dev.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_ioctl.h>
diff --git a/trunk/include/linux/compat_ioctl.h b/trunk/include/linux/compat_ioctl.h
index 89ab677cb993..917d62e41480 100644
--- a/trunk/include/linux/compat_ioctl.h
+++ b/trunk/include/linux/compat_ioctl.h
@@ -673,6 +673,11 @@ COMPATIBLE_IOCTL(CAPI_SET_FLAGS)
 COMPATIBLE_IOCTL(CAPI_CLR_FLAGS)
 COMPATIBLE_IOCTL(CAPI_NCCI_OPENCOUNT)
 COMPATIBLE_IOCTL(CAPI_NCCI_GETUNIT)
+/* Siemens Gigaset */
+COMPATIBLE_IOCTL(GIGASET_REDIR)
+COMPATIBLE_IOCTL(GIGASET_CONFIG)
+COMPATIBLE_IOCTL(GIGASET_BRKCHARS)
+COMPATIBLE_IOCTL(GIGASET_VERSION)
 /* Misc. */
 COMPATIBLE_IOCTL(0x41545900)		/* ATYIO_CLKR */
 COMPATIBLE_IOCTL(0x41545901)		/* ATYIO_CLKW */