Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6-omap-h63xx.git] / include / asm-alpha / poll.h

diff --git a/include/asm-alpha/poll.h b/include/asm-alpha/poll.h
index 95707182b3ed3c7a7c7609d4307bc137c0572a48..c98509d3149e637951f5edf96116a70ed9d8bc51 100644 (file)
--- a/include/asm-alpha/poll.h
+++ b/include/asm-alpha/poll.h
@@ -1,25 +1 @@
-#ifndef __ALPHA_POLL_H
-#define __ALPHA_POLL_H
-
-#define POLLIN         (1 << 0)
-#define POLLPRI                (1 << 1)
-#define POLLOUT                (1 << 2)
-#define POLLERR                (1 << 3)
-#define POLLHUP                (1 << 4)
-#define POLLNVAL       (1 << 5)
-#define POLLRDNORM     (1 << 6)
-#define POLLRDBAND     (1 << 7)
-#define POLLWRNORM     (1 << 8)
-#define POLLWRBAND     (1 << 9)
-#define POLLMSG                (1 << 10)
-#define POLLREMOVE     (1 << 11)
-#define POLLRDHUP       (1 << 12)
-
-
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
-
-#endif
+#include <asm-generic/poll.h>