Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/include/asm-m68k/poll.h b/include/asm-m68k/poll.h
index 0fb8843..f080fcd 100644 (file)
--- a/include/asm-m68k/poll.h
+++ b/include/asm-m68k/poll.h
@@ -1,24 +1,9 @@
 #ifndef __m68k_POLL_H
 #define __m68k_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 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