diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 17:08:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 00:41:24 -0400 |
| commit | 62e612f0abb33c99c55ea3d04626f6799a1cdca9 (patch) | |
| tree | 34b259d0aae4e639838f2e43d92f0110ffa888a8 /include/asm-sparc64 | |
| parent | 4835bd988e58150c0a6e2d3e13e319a56ed821dc (diff) | |
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>
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/poll.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/asm-sparc64/poll.h b/include/asm-sparc64/poll.h index ebeeb3816c40..8e2f31b4641a 100644 --- a/include/asm-sparc64/poll.h +++ b/include/asm-sparc64/poll.h | |||
| @@ -1,12 +1 @@ | |||
| 1 | #ifndef __SPARC64_POLL_H | #include <asm-sparc/poll.h> | |
| 2 | #define __SPARC64_POLL_H | ||
| 3 | |||
| 4 | #define POLLWRNORM POLLOUT | ||
| 5 | #define POLLWRBAND 256 | ||
| 6 | #define POLLMSG 512 | ||
| 7 | #define POLLREMOVE 1024 | ||
| 8 | #define POLLRDHUP 2048 | ||
| 9 | |||
| 10 | #include <asm-generic/poll.h> | ||
| 11 | |||
| 12 | #endif | ||