diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:10:20 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:10:20 +0200 |
| commit | d0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch) | |
| tree | 105651af2db033de4803b91cc029381a1b9b39d2 /arch/ia64 | |
| parent | [IA64] Avoid .spillpsp directive in handcoded assembly (diff) | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/u... (diff) | |
| download | linux-d0dac8082cbc2b234917ec53eb591b1ddbec80bb.tar.xz linux-d0dac8082cbc2b234917ec53eb591b1ddbec80bb.zip | |
Merge with linus
Diffstat (limited to 'arch/ia64')
| -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)) |