summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/poll.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 12:38:02 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-27 12:38:02 +0100
commit5292ae11babca23c3ff82593630d2d7eebc350a9 (patch)
tree30a6c8123b35686098f306ea39398b7621f42054 /arch/x86/include/asm/poll.h
parentx86, uv: use consistent names for region size and conherence id on x86 and ia64 (diff)
parentLinux 2.6.28-rc2 (diff)
downloadlinux-5292ae11babca23c3ff82593630d2d7eebc350a9.tar.xz
linux-5292ae11babca23c3ff82593630d2d7eebc350a9.zip
Merge commit 'v2.6.28-rc2' into x86/uv
Diffstat (limited to 'arch/x86/include/asm/poll.h')
-rw-r--r--arch/x86/include/asm/poll.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/poll.h b/arch/x86/include/asm/poll.h
new file mode 100644
index 000000000000..c98509d3149e
--- /dev/null
+++ b/arch/x86/include/asm/poll.h
@@ -0,0 +1 @@
+#include <asm-generic/poll.h>