summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/uapi/asm/poll.h
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2012-10-09 16:09:57 -0700
committerTony Luck <tony.luck@intel.com>2012-10-09 16:09:57 -0700
commitd536e0db2433686238ec97c517e4fc691000ee6f (patch)
tree10d648ed6a74310c91a8c09e60b03f8328dfd677 /arch/ia64/include/uapi/asm/poll.h
parent9e2d8656f5e8aa214e66b462680cf86b210b74a8 (diff)
parent43e40f25d2c090392fc36cb900b42972e88cc2e2 (diff)
Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next
UAPI Disintegration 2012-10-09
Diffstat (limited to 'arch/ia64/include/uapi/asm/poll.h')
-rw-r--r--arch/ia64/include/uapi/asm/poll.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/uapi/asm/poll.h b/arch/ia64/include/uapi/asm/poll.h
new file mode 100644
index 00000000000..c98509d3149
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/poll.h
@@ -0,0 +1 @@
+#include <asm-generic/poll.h>