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, 1 insertions, 25 deletions

diff --git a/include/asm-alpha/poll.h b/include/asm-alpha/poll.h
index 76f89356b6a7..c98509d3149e 100644
--- a/include/asm-alpha/poll.h
+++ b/include/asm-alpha/poll.h
@@ -1,25 +1 @@
-#ifndef __ALPHA_POLL_H
-#define __ALPHA_POLL_H
-
-#define POLLIN          (1 << 0)
-#define POLLPRI         (1 << 1)
-#define POLLOUT         (1 << 2)
-#define POLLERR         (1 << 3)
-#define POLLHUP         (1 << 4)
-#define POLLNVAL        (1 << 5)
-#define POLLRDNORM      (1 << 6)
-#define POLLRDBAND      (1 << 7)
-#define POLLWRNORM      (1 << 8)
-#define POLLWRBAND      (1 << 9)
-#define POLLMSG         (1 << 10)
-#define POLLREMOVE      (1 << 12)
-#define POLLRDHUP       (1 << 13)
-
-
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-
-#endif
+#include <asm-generic/poll.h>