From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 5 Jun 2008 21:08:51 +0000 (+0200)
Subject: sparc: Merge asm-sparc{,64}/poll.h
X-Git-Tag: v2.6.27-rc1~959^2~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=62e612f0abb33c99c55ea3d04626f6799a1cdca9;p=linux-2.6-omap-h63xx.git

sparc: Merge asm-sparc{,64}/poll.h

:$ diff -u include/asm-sparc/poll.h include/asm-sparc64/poll.h
:-- include/asm-sparc/poll.h	2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/poll.h	2008-06-13 06:42:07.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef __SPARC_POLL_H
:-#define __SPARC_POLL_H
:+#ifndef __SPARC64_POLL_H
:+#define __SPARC64_POLL_H
:
: #define POLLWRNORM	POLLOUT
: #define POLLWRBAND	256

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h
index ebeeb3816c4..8e2f31b4641 100644
--- 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>