summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/ioctl.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-28 16:46:59 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-28 16:46:59 +0100
commit2011a067281565494494aee194ca5081e52d6c3f (patch)
treee0b21ad43e6eeb0c67945026be71d1278c93c695 /arch/x86/include/asm/ioctl.h
parent63fb70859f987f2b3b8028fa467fd63336315e9c (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
Merge commit 'v2.6.28-rc2' into x86/doc
Diffstat (limited to 'arch/x86/include/asm/ioctl.h')
-rw-r--r--arch/x86/include/asm/ioctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/ioctl.h b/arch/x86/include/asm/ioctl.h
new file mode 100644
index 00000000000..b279fe06dfe
--- /dev/null
+++ b/arch/x86/include/asm/ioctl.h
@@ -0,0 +1 @@
+#include <asm-generic/ioctl.h>