X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Flinux%2Fpoll.h;h=c08386fb3e0845933f074bda2117734c128075b3;hb=b74d3feccc3f5e6e4cf98cf88daa2e0cdbc4ca62;hp=48fe8bc398d1a388c55ee7b99041ff5a84b25ea3;hpb=645832cce2955bdcd0c3166478b84ea7afd0ea53;p=~andy%2Flinux

diff --git a/include/linux/poll.h b/include/linux/poll.h
index 48fe8bc398d..c08386fb3e0 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -1,9 +1,6 @@
 #ifndef _LINUX_POLL_H
 #define _LINUX_POLL_H
 
-#include <asm/poll.h>
-
-#ifdef __KERNEL__
 
 #include <linux/compiler.h>
 #include <linux/ktime.h>
@@ -12,6 +9,7 @@
 #include <linux/fs.h>
 #include <linux/sysctl.h>
 #include <asm/uaccess.h>
+#include <uapi/linux/poll.h>
 
 extern struct ctl_table epoll_table[]; /* for sysctl */
 /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating
@@ -163,6 +161,4 @@ extern int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
 
 extern int poll_select_set_timeout(struct timespec *to, long sec, long nsec);
 
-#endif /* KERNEL */
-
 #endif /* _LINUX_POLL_H */