diff options
| author | Christoph Hellwig <hch@lst.de> | 2005-05-17 00:53:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 10:59:21 -0400 |
| commit | 5418b6925c353c8286651b67fdb8559dd9e54e46 (patch) | |
| tree | cc380fc2fd9af6cf9930bd256f09499ef53915a5 | |
| parent | afbf510d47c4009f5d67ec3c0e0b45eb0441bca3 (diff) | |
[PATCH] kill <asm/ioctl32.h>
These days <linux/ioctl32.h> handles everything, no need for an asm
header on just two architectures.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/ia64/ia32/ia32_ioctl.c | 1 | ||||
| -rw-r--r-- | include/asm-ia64/ioctl32.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/ioctl32.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/ia32/ia32_ioctl.c b/arch/ia64/ia32/ia32_ioctl.c index 9845dabe2613..164b211f4174 100644 --- a/arch/ia64/ia32/ia32_ioctl.c +++ b/arch/ia64/ia32/ia32_ioctl.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #define INCLUDES | 14 | #define INCLUDES |
| 15 | #include "compat_ioctl.c" | 15 | #include "compat_ioctl.c" |
| 16 | #include <asm/ioctl32.h> | ||
| 17 | 16 | ||
| 18 | #define IOCTL_NR(a) ((a) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT)) | 17 | #define IOCTL_NR(a) ((a) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT)) |
| 19 | 18 | ||
diff --git a/include/asm-ia64/ioctl32.h b/include/asm-ia64/ioctl32.h index d0d227f45e05..e69de29bb2d1 100644 --- a/include/asm-ia64/ioctl32.h +++ b/include/asm-ia64/ioctl32.h | |||
| @@ -1 +0,0 @@ | |||
| 1 | #include <linux/ioctl32.h> | ||
diff --git a/include/asm-x86_64/ioctl32.h b/include/asm-x86_64/ioctl32.h index d0d227f45e05..e69de29bb2d1 100644 --- a/include/asm-x86_64/ioctl32.h +++ b/include/asm-x86_64/ioctl32.h | |||
| @@ -1 +0,0 @@ | |||
| 1 | #include <linux/ioctl32.h> | ||