Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6

[pandora-kernel.git] / include / asm-mips / poll.h

diff --git a/include/asm-mips/poll.h b/include/asm-mips/poll.h
index 70881f8..47b9520 100644 (file)
--- a/include/asm-mips/poll.h
+++ b/include/asm-mips/poll.h
@@ -1,28 +1,9 @@
 #ifndef __ASM_POLL_H
 #define __ASM_POLL_H
 
-#define POLLIN         0x0001
-#define POLLPRI                0x0002
-#define POLLOUT                0x0004
-
-#define POLLERR                0x0008
-#define POLLHUP                0x0010
-#define POLLNVAL       0x0020
-
-#define POLLRDNORM     0x0040
-#define POLLRDBAND     0x0080
 #define POLLWRNORM     POLLOUT
 #define POLLWRBAND     0x0100
 
-/* These seem to be more or less nonstandard ...  */
-#define POLLMSG                0x0400
-#define POLLREMOVE     0x1000
-#define POLLRDHUP       0x2000
-
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
+#include <asm-generic/poll.h>
 
 #endif /* __ASM_POLL_H */