Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

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

diff --git a/include/asm-xtensa/poll.h b/include/asm-xtensa/poll.h
index dffe447..9d2d599 100644 (file)
--- a/include/asm-xtensa/poll.h
+++ b/include/asm-xtensa/poll.h
@@ -11,27 +11,10 @@
 #ifndef _XTENSA_POLL_H
 #define _XTENSA_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
-
-#define POLLMSG                0x0400
 #define POLLREMOVE     0x0800
 
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
+#include <asm-generic/poll.h>
 
 #endif /* _XTENSA_POLL_H */