diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 12:10:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 12:10:20 -0400 |
| commit | d0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch) | |
| tree | 105651af2db033de4803b91cc029381a1b9b39d2 /arch/ia64 | |
| parent | bfd68594082d8384781c242aa72a7950b5cf51aa (diff) | |
| parent | ff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff) | |
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 @@ | |||
| 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 | ||