diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/ia64/ia32/ia32_ioctl.c | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 @@ | |||
| 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 | ||