aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/include/asm/ioctl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 09:51:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 09:51:51 -0700
commit0242909a6135e10a28822c64f9ad50fdad52757c (patch)
treec5f9c8abe95a65433e6ac356871f2379c02488fe /arch/cris/include/asm/ioctl.h
parent0a6d2fac615972142715d736289abeeb7382e81d (diff)
parent556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff)
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris: [CRIS] Move header files from include to arch/cris/include. [CRISv32] Remove warning in io.h
Diffstat (limited to 'arch/cris/include/asm/ioctl.h')
-rw-r--r--arch/cris/include/asm/ioctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/ioctl.h b/arch/cris/include/asm/ioctl.h
new file mode 100644
index 00000000000..b279fe06dfe
--- /dev/null
+++ b/arch/cris/include/asm/ioctl.h
@@ -0,0 +1 @@
+#include <asm-generic/ioctl.h>