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, 26 deletions

diff --git a/include/asm-cris/poll.h b/include/asm-cris/poll.h
index 1b25d4cf498c..c98509d3149e 100644
--- a/include/asm-cris/poll.h
+++ b/include/asm-cris/poll.h
@@ -1,26 +1 @@
-#ifndef __ASM_CRIS_POLL_H
-#define __ASM_CRIS_POLL_H
-
-/* taken from asm-alpha */
-
-#define POLLIN          1
-#define POLLPRI         2
-#define POLLOUT         4
-#define POLLERR         8
-#define POLLHUP         16
-#define POLLNVAL        32
-#define POLLRDNORM      64
-#define POLLRDBAND      128
-#define POLLWRNORM      256
-#define POLLWRBAND      512
-#define POLLMSG         1024
-#define POLLREMOVE      4096
-#define POLLRDHUP       8192
-
-struct pollfd {
-        int fd;
-        short events;
-        short revents;
-};
-
-#endif
+#include <asm-generic/poll.h>