diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-05-10 22:22:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 08:29:34 -0700 |
commit | 04dd08b45be863f016df648a149ade1411608d00 (patch) | |
tree | 9787f5d7b1fb808873e68209df9496e54509dab4 /include/asm-alpha | |
parent | 99eaf3c45fe806c4a7f39b9be4a1bd0dfc617699 (diff) | |
download | kernel_samsung_smdk4412-04dd08b45be863f016df648a149ade1411608d00.zip kernel_samsung_smdk4412-04dd08b45be863f016df648a149ade1411608d00.tar.gz kernel_samsung_smdk4412-04dd08b45be863f016df648a149ade1411608d00.tar.bz2 |
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-alpha')
-rw-r--r-- | include/asm-alpha/poll.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/include/asm-alpha/poll.h b/include/asm-alpha/poll.h index 76f8935..c98509d 100644 --- a/include/asm-alpha/poll.h +++ b/include/asm-alpha/poll.h @@ -1,25 +1 @@ -#ifndef __ALPHA_POLL_H -#define __ALPHA_POLL_H - -#define POLLIN (1 << 0) -#define POLLPRI (1 << 1) -#define POLLOUT (1 << 2) -#define POLLERR (1 << 3) -#define POLLHUP (1 << 4) -#define POLLNVAL (1 << 5) -#define POLLRDNORM (1 << 6) -#define POLLRDBAND (1 << 7) -#define POLLWRNORM (1 << 8) -#define POLLWRBAND (1 << 9) -#define POLLMSG (1 << 10) -#define POLLREMOVE (1 << 12) -#define POLLRDHUP (1 << 13) - - -struct pollfd { - int fd; - short events; - short revents; -}; - -#endif +#include <asm-generic/poll.h> |