diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 12:54:00 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 12:54:00 +0200 |
| commit | 7063e6c717f6108c4b3fc3135a516c86ef944870 (patch) | |
| tree | ec6eec10b4dc93474100e6e366df028bd3314fda /arch/ia64/ia32/ia32_ioctl.c | |
| parent | AUDIT: Quis Custodiet Ipsos Custodes? (diff) | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/d... (diff) | |
| download | linux-7063e6c717f6108c4b3fc3135a516c86ef944870.tar.xz linux-7063e6c717f6108c4b3fc3135a516c86ef944870.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/ia32/ia32_ioctl.c')
| -rw-r--r-- | arch/ia64/ia32/ia32_ioctl.c | 1 |
1 files changed, 0 insertions, 1 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 @@ #define INCLUDES #include "compat_ioctl.c" -#include <asm/ioctl32.h> #define IOCTL_NR(a) ((a) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT)) |