diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-05-11 01:22:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 11:29:34 -0400 |
commit | 04dd08b45be863f016df648a149ade1411608d00 (patch) | |
tree | 9787f5d7b1fb808873e68209df9496e54509dab4 /include/asm-mips | |
parent | 99eaf3c45fe806c4a7f39b9be4a1bd0dfc617699 (diff) |
Consolidate asm/poll.h
These files are almost all the same.
This patch could be made even simpler if we don't mind POLLREMOVE turning
up in a few architectures that didn't have it previously (which should be
OK as POLLREMOVE is not used anywhere in the current tree).
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/poll.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/include/asm-mips/poll.h b/include/asm-mips/poll.h index 70881f8c5c50..47b952080431 100644 --- a/include/asm-mips/poll.h +++ b/include/asm-mips/poll.h | |||
@@ -1,28 +1,9 @@ | |||
1 | #ifndef __ASM_POLL_H | 1 | #ifndef __ASM_POLL_H |
2 | #define __ASM_POLL_H | 2 | #define __ASM_POLL_H |
3 | 3 | ||
4 | #define POLLIN 0x0001 | ||
5 | #define POLLPRI 0x0002 | ||
6 | #define POLLOUT 0x0004 | ||
7 | |||
8 | #define POLLERR 0x0008 | ||
9 | #define POLLHUP 0x0010 | ||
10 | #define POLLNVAL 0x0020 | ||
11 | |||
12 | #define POLLRDNORM 0x0040 | ||
13 | #define POLLRDBAND 0x0080 | ||
14 | #define POLLWRNORM POLLOUT | 4 | #define POLLWRNORM POLLOUT |
15 | #define POLLWRBAND 0x0100 | 5 | #define POLLWRBAND 0x0100 |
16 | 6 | ||
17 | /* These seem to be more or less nonstandard ... */ | 7 | #include <asm-generic/poll.h> |
18 | #define POLLMSG 0x0400 | ||
19 | #define POLLREMOVE 0x1000 | ||
20 | #define POLLRDHUP 0x2000 | ||
21 | |||
22 | struct pollfd { | ||
23 | int fd; | ||
24 | short events; | ||
25 | short revents; | ||
26 | }; | ||
27 | 8 | ||
28 | #endif /* __ASM_POLL_H */ | 9 | #endif /* __ASM_POLL_H */ |