projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc...
[powerpc.git]
/
arch
/
ia64
/
ia32
/
ia32_ioctl.c
diff --git
a/arch/ia64/ia32/ia32_ioctl.c
b/arch/ia64/ia32/ia32_ioctl.c
index
9845dab
..
164b211
100644
(file)
--- 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))