drm: merge Linux master into HEAD

[sfrench/cifs-2.6.git] / include / asm-m32r / poll.h

diff --git a/include/asm-m32r/poll.h b/include/asm-m32r/poll.h
index 43b7acf732d57ae1310819edb022133fb6b1fb1f..c98509d3149e637951f5edf96116a70ed9d8bc51 100644 (file)
--- a/include/asm-m32r/poll.h
+++ b/include/asm-m32r/poll.h
@@ -1,31 +1 @@
-#ifndef _ASM_M32R_POLL_H
-#define _ASM_M32R_POLL_H
-
-/*
- * poll(2) bit definitions.  Based on <asm-i386/poll.h>.
- *
- * Modified 2004
- *      Hirokazu Takata <takata at linux-m32r.org>
- */
-
-#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     0x0100
-#define POLLWRBAND     0x0200
-#define POLLMSG                0x0400
-#define POLLREMOVE     0x1000
-
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
-
-#endif  /* _ASM_M32R_POLL_H */
+#include <asm-generic/poll.h>