Merge git://git.infradead.org/battery-2.6

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

diff --git a/arch/blackfin/include/asm/poll.h b/arch/blackfin/include/asm/poll.h
index 94cc263..a055667 100644 (file)
--- a/arch/blackfin/include/asm/poll.h
+++ b/arch/blackfin/include/asm/poll.h
@@ -1,24 +1,9 @@
 #ifndef __BFIN_POLL_H
 #define __BFIN_POLL_H
 
-#define POLLIN           1
-#define POLLPRI                  2
-#define POLLOUT                  4
-#define POLLERR                  8
-#define POLLHUP                 16
-#define POLLNVAL        32
-#define POLLRDNORM      64
-#define POLLWRNORM     POLLOUT
-#define POLLRDBAND     128
+#define POLLWRNORM     4 /* POLLOUT */
 #define POLLWRBAND     256
-#define POLLMSG                0x0400
-#define POLLREMOVE     0x1000
-#define POLLRDHUP       0x2000
 
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
+#include <asm-generic/poll.h>
 
-#endif                         /* __BFIN_POLL_H */
+#endif