Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / asm-cris / poll.h

diff --git a/include/asm-cris/poll.h b/include/asm-cris/poll.h
index 1c0efc3e4be70e5fc067a4ee9d01cc0426471567..c98509d3149e637951f5edf96116a70ed9d8bc51 100644 (file)
--- a/include/asm-cris/poll.h
+++ b/include/asm-cris/poll.h
@@ -1,25 +1 @@
-#ifndef __ASM_CRIS_POLL_H
-#define __ASM_CRIS_POLL_H
-
-/* taken from asm-alpha */
-
-#define POLLIN         1
-#define POLLPRI                2
-#define POLLOUT                4
-#define POLLERR                8
-#define POLLHUP                16
-#define POLLNVAL       32
-#define POLLRDNORM     64
-#define POLLRDBAND     128
-#define POLLWRNORM     256
-#define POLLWRBAND     512
-#define POLLMSG                1024
-#define POLLREMOVE     4096
-
-struct pollfd {
-       int fd;
-       short events;
-       short revents;
-};
-
-#endif
+#include <asm-generic/poll.h>