Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[powerpc.git] / include / asm-cris / poll.h

diff --git a/include/asm-cris/poll.h b/include/asm-cris/poll.h
index 1c0efc3..c98509d 100644 (file)
--- a/include/asm-cris/poll.h
+++ b/include/asm-cris/poll.h
@@ -1,25 +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
-
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
-
-#endif
+#include <asm-generic/poll.h>