diff options
author | 2005-05-27 01:16:24 -0700 | |
---|---|---|
committer | 2005-05-27 01:16:24 -0700 | |
commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /arch/ia64/ia32/ia32_ioctl.c | |
parent | [XFS] Fix directory inodes ioctl compat code, minor code consistency cleanups (diff) | |
parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-dev-b19312c4c8f3f84da57bba01d45549df1cf10dcd.tar.xz linux-dev-b19312c4c8f3f84da57bba01d45549df1cf10dcd.zip |
Merge with /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)) |