Consolidate asm/poll.h

These files are almost all the same.

This patch could be made even simpler if we don't mind POLLREMOVE turning
up in a few architectures that didn't have it previously (which should be
OK as POLLREMOVE is not used anywhere in the current tree).

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 15 deletions

diff --git a/include/asm-h8300/poll.h b/include/asm-h8300/poll.h
index fc52103b276a..f61540c22d94 100644
--- a/include/asm-h8300/poll.h
+++ b/include/asm-h8300/poll.h
@@ -1,23 +1,11 @@
 #ifndef __H8300_POLL_H
 #define __H8300_POLL_H
 
-#define POLLIN            1
-#define POLLPRI           2
-#define POLLOUT           4
-#define POLLERR           8
-#define POLLHUP          16
-#define POLLNVAL         32
-#define POLLRDNORM       64
 #define POLLWRNORM      POLLOUT
-#define POLLRDBAND      128
 #define POLLWRBAND      256
-#define POLLMSG         0x0400
-#define POLLRDHUP       0x2000
 
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
+#include <asm-generic/poll.h>
+
+#undef POLLREMOVE
 
 #endif