Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[deliverable/linux.git] / include / asm-sparc64 / poll.h

diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h
index ebeeb3816c40397bfdd66e03126c1bf13dbdc8ff..8e2f31b4641ac6bc6082ea3a5c0787863658395c 100644 (file)
--- a/include/asm-sparc64/poll.h
+++ b/include/asm-sparc64/poll.h
@@ -1,12 +1 @@
-#ifndef __SPARC64_POLL_H
-#define __SPARC64_POLL_H
-
-#define POLLWRNORM     POLLOUT
-#define POLLWRBAND     256
-#define POLLMSG                512
-#define POLLREMOVE     1024
-#define POLLRDHUP       2048
-
-#include <asm-generic/poll.h>
-
-#endif
+#include <asm-sparc/poll.h>