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>
This commit is contained in:
Sam Ravnborg 2008-06-05 23:08:51 +02:00 committed by David S. Miller
parent 4835bd988e
commit 62e612f0ab

View File

@ -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>