diff --git a/[refs] b/[refs]
index 1a46b5978ff2..f30c30557112 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4835bd988e58150c0a6e2d3e13e319a56ed821dc
+refs/heads/master: 62e612f0abb33c99c55ea3d04626f6799a1cdca9
diff --git a/trunk/include/asm-sparc64/poll.h b/trunk/include/asm-sparc64/poll.h
index ebeeb3816c40..8e2f31b4641a 100644
--- a/trunk/include/asm-sparc64/poll.h
+++ b/trunk/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>