From: Christoph Hellwig <hch@lst.de>

These days ioctl32.h is only used for communication of fs/compat.c and
fs/compat_ioctl.c and doesn't contain anything of interest to drivers.

Remove inclusion in various drivers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/s390/kernel/s390_ksyms.c       |    1 -
 arch/x86_64/kernel/x8664_ksyms.c    |    1 -
 drivers/char/drm/drm_ioc32.c        |    1 -
 drivers/char/drm/i915_ioc32.c       |    1 -
 drivers/char/drm/mga_ioc32.c        |    1 -
 drivers/char/drm/r128_ioc32.c       |    1 -
 drivers/char/drm/radeon_ioc32.c     |    1 -
 drivers/ieee1394/amdtp.c            |    1 -
 drivers/ieee1394/dv1394.c           |    1 -
 drivers/ieee1394/video1394.c        |    1 -
 drivers/message/fusion/mptctl.c     |    2 --
 drivers/s390/crypto/z90main.c       |    1 -
 drivers/scsi/aacraid/linit.c        |    1 -
 drivers/scsi/ch.c                   |    1 -
 drivers/scsi/megaraid/megaraid_mm.h |    1 -
 fs/xfs/linux-2.6/xfs_ioctl32.c      |    1 -
 16 files changed, 17 deletions(-)

diff -puN arch/s390/kernel/s390_ksyms.c~dont-include-ioctl32h-in-drivers arch/s390/kernel/s390_ksyms.c
--- devel/arch/s390/kernel/s390_ksyms.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/arch/s390/kernel/s390_ksyms.c	2005-12-13 14:38:32.000000000 -0800
@@ -10,7 +10,6 @@
 #include <linux/smp.h>
 #include <linux/syscalls.h>
 #include <linux/interrupt.h>
-#include <linux/ioctl32.h>
 #include <asm/checksum.h>
 #include <asm/cpcmd.h>
 #include <asm/delay.h>
diff -puN arch/x86_64/kernel/x8664_ksyms.c~dont-include-ioctl32h-in-drivers arch/x86_64/kernel/x8664_ksyms.c
--- devel/arch/x86_64/kernel/x8664_ksyms.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/arch/x86_64/kernel/x8664_ksyms.c	2005-12-13 14:38:32.000000000 -0800
@@ -13,7 +13,6 @@
 #include <linux/string.h>
 #include <linux/syscalls.h>
 #include <linux/tty.h>
-#include <linux/ioctl32.h>
 
 #include <asm/semaphore.h>
 #include <asm/processor.h>
diff -puN drivers/char/drm/drm_ioc32.c~dont-include-ioctl32h-in-drivers drivers/char/drm/drm_ioc32.c
--- devel/drivers/char/drm/drm_ioc32.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/char/drm/drm_ioc32.c	2005-12-13 14:38:32.000000000 -0800
@@ -28,7 +28,6 @@
  * IN THE SOFTWARE.
  */
 #include <linux/compat.h>
-#include <linux/ioctl32.h>
 
 #include "drmP.h"
 #include "drm_core.h"
diff -puN drivers/char/drm/i915_ioc32.c~dont-include-ioctl32h-in-drivers drivers/char/drm/i915_ioc32.c
--- devel/drivers/char/drm/i915_ioc32.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/char/drm/i915_ioc32.c	2005-12-13 14:38:32.000000000 -0800
@@ -30,7 +30,6 @@
  * IN THE SOFTWARE.
  */
 #include <linux/compat.h>
-#include <linux/ioctl32.h>
 
 #include "drmP.h"
 #include "drm.h"
diff -puN drivers/char/drm/mga_ioc32.c~dont-include-ioctl32h-in-drivers drivers/char/drm/mga_ioc32.c
--- devel/drivers/char/drm/mga_ioc32.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/char/drm/mga_ioc32.c	2005-12-13 14:38:32.000000000 -0800
@@ -31,7 +31,6 @@
  * IN THE SOFTWARE.
  */
 #include <linux/compat.h>
-#include <linux/ioctl32.h>
 
 #include "drmP.h"
 #include "drm.h"
diff -puN drivers/char/drm/r128_ioc32.c~dont-include-ioctl32h-in-drivers drivers/char/drm/r128_ioc32.c
--- devel/drivers/char/drm/r128_ioc32.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/char/drm/r128_ioc32.c	2005-12-13 14:38:32.000000000 -0800
@@ -30,7 +30,6 @@
  * IN THE SOFTWARE.
  */
 #include <linux/compat.h>
-#include <linux/ioctl32.h>
 
 #include "drmP.h"
 #include "drm.h"
diff -puN drivers/char/drm/radeon_ioc32.c~dont-include-ioctl32h-in-drivers drivers/char/drm/radeon_ioc32.c
--- devel/drivers/char/drm/radeon_ioc32.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/char/drm/radeon_ioc32.c	2005-12-13 14:38:32.000000000 -0800
@@ -28,7 +28,6 @@
  * IN THE SOFTWARE.
  */
 #include <linux/compat.h>
-#include <linux/ioctl32.h>
 
 #include "drmP.h"
 #include "drm.h"
diff -puN drivers/ieee1394/amdtp.c~dont-include-ioctl32h-in-drivers drivers/ieee1394/amdtp.c
--- devel/drivers/ieee1394/amdtp.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/ieee1394/amdtp.c	2005-12-13 14:38:32.000000000 -0800
@@ -80,7 +80,6 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/poll.h>
-#include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/cdev.h>
 #include <asm/uaccess.h>
diff -puN drivers/ieee1394/dv1394.c~dont-include-ioctl32h-in-drivers drivers/ieee1394/dv1394.c
--- devel/drivers/ieee1394/dv1394.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/ieee1394/dv1394.c	2005-12-13 14:38:32.000000000 -0800
@@ -108,7 +108,6 @@
 #include <linux/types.h>
 #include <linux/vmalloc.h>
 #include <linux/string.h>
-#include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/cdev.h>
 
diff -puN drivers/ieee1394/video1394.c~dont-include-ioctl32h-in-drivers drivers/ieee1394/video1394.c
--- devel/drivers/ieee1394/video1394.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/ieee1394/video1394.c	2005-12-13 14:38:32.000000000 -0800
@@ -48,7 +48,6 @@
 #include <linux/vmalloc.h>
 #include <linux/timex.h>
 #include <linux/mm.h>
-#include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/cdev.h>
 
diff -puN drivers/message/fusion/mptctl.c~dont-include-ioctl32h-in-drivers drivers/message/fusion/mptctl.c
--- devel/drivers/message/fusion/mptctl.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/message/fusion/mptctl.c	2005-12-13 14:38:32.000000000 -0800
@@ -2585,8 +2585,6 @@ static struct miscdevice mptctl_miscdev 
 
 #ifdef CONFIG_COMPAT
 
-#include <linux/ioctl32.h>
-
 static int
 compat_mptfwxfer_ioctl(struct file *filp, unsigned int cmd,
 			unsigned long arg)
diff -puN drivers/s390/crypto/z90main.c~dont-include-ioctl32h-in-drivers drivers/s390/crypto/z90main.c
--- devel/drivers/s390/crypto/z90main.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/s390/crypto/z90main.c	2005-12-13 14:38:32.000000000 -0800
@@ -30,7 +30,6 @@
 #include <linux/delay.h>       // mdelay
 #include <linux/init.h>
 #include <linux/interrupt.h>   // for tasklets
-#include <linux/ioctl32.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff -puN drivers/scsi/aacraid/linit.c~dont-include-ioctl32h-in-drivers drivers/scsi/aacraid/linit.c
--- devel/drivers/scsi/aacraid/linit.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/scsi/aacraid/linit.c	2005-12-13 14:38:32.000000000 -0800
@@ -46,7 +46,6 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/syscalls.h>
-#include <linux/ioctl32.h>
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
 #include <asm/semaphore.h>
diff -puN drivers/scsi/ch.c~dont-include-ioctl32h-in-drivers drivers/scsi/ch.c
--- devel/drivers/scsi/ch.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/scsi/ch.c	2005-12-13 14:38:32.000000000 -0800
@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/completion.h>
-#include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/chio.h>			/* here are all the ioctls */
 
diff -puN drivers/scsi/megaraid/megaraid_mm.h~dont-include-ioctl32h-in-drivers drivers/scsi/megaraid/megaraid_mm.h
--- devel/drivers/scsi/megaraid/megaraid_mm.h~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/drivers/scsi/megaraid/megaraid_mm.h	2005-12-13 14:38:32.000000000 -0800
@@ -22,7 +22,6 @@
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
 #include <linux/list.h>
-#include <linux/ioctl32.h>
 
 #include "mbox_defs.h"
 #include "megaraid_ioctl.h"
diff -puN fs/xfs/linux-2.6/xfs_ioctl32.c~dont-include-ioctl32h-in-drivers fs/xfs/linux-2.6/xfs_ioctl32.c
--- devel/fs/xfs/linux-2.6/xfs_ioctl32.c~dont-include-ioctl32h-in-drivers	2005-12-13 14:38:32.000000000 -0800
+++ devel-akpm/fs/xfs/linux-2.6/xfs_ioctl32.c	2005-12-13 14:38:32.000000000 -0800
@@ -19,7 +19,6 @@
 #include <linux/compat.h>
 #include <linux/init.h>
 #include <linux/ioctl.h>
-#include <linux/ioctl32.h>
 #include <linux/syscalls.h>
 #include <linux/types.h>
 #include <linux/fs.h>
_