The patch titled
i4l: Gigaset drivers: add IOCTLs to compat_ioctl.h
has been added to the -mm tree. Its filename is
i4l-gigaset-drivers-add-ioctls-to-compat_ioctlh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i4l: Gigaset drivers: add IOCTLs to compat_ioctl.h
From: Hansjoerg Lipp <hjlipp@xxxxxx>
Add the IOCTLs of the Gigaset drivers to compat_ioctl.h in order to make
them available for 32 bit programs on 64 bit platforms. Please merge.
Signed-off-by: Hansjoerg Lipp <hjlipp@xxxxxx>
Acked-by: Tilman Schmidt <tilman@xxxxxxx>
Cc: Karsten Keil <kkeil@xxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/compat_ioctl.c | 1 +
include/linux/compat_ioctl.h | 5 +++++
2 files changed, 6 insertions(+)
diff -puN fs/compat_ioctl.c~i4l-gigaset-drivers-add-ioctls-to-compat_ioctlh fs/compat_ioctl.c
--- a/fs/compat_ioctl.c~i4l-gigaset-drivers-add-ioctls-to-compat_ioctlh
+++ a/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 -puN include/linux/compat_ioctl.h~i4l-gigaset-drivers-add-ioctls-to-compat_ioctlh include/linux/compat_ioctl.h
--- a/include/linux/compat_ioctl.h~i4l-gigaset-drivers-add-ioctls-to-compat_ioctlh
+++ a/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 */
_
Patches currently in -mm which might be from hjlipp@xxxxxx are
isdn4linux-gigaset-base-driver-improve-error-recovery.patch
isdn4linux-gigaset-driver-cleanup.patch
i4l-gigaset-drivers-add-ioctls-to-compat_ioctlh.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
