aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-28 01:56:22 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 09:16:02 -0800
commit7a1e524a5fe6c5bf9dd4488e946fa835fda8c3d9 (patch)
tree1bb01a06d4e269e7af14ac9c38e70349ab547404
parent273577165cd206d2d6689ee4b18aa13de1ec4bde (diff)
downloadkernel_samsung_tuna-7a1e524a5fe6c5bf9dd4488e946fa835fda8c3d9.zip
kernel_samsung_tuna-7a1e524a5fe6c5bf9dd4488e946fa835fda8c3d9.tar.gz
kernel_samsung_tuna-7a1e524a5fe6c5bf9dd4488e946fa835fda8c3d9.tar.bz2
[PATCH] alpha: make poll flags the same as other architectures
Renumber the recently-added POLLREMOVE and POLLRDHUP to line up with the other architectures. Cc: Davide Libenzi <davidel@xmailserver.org> Cc: Ulrich Drepper <drepper@redhat.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-alpha/poll.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-alpha/poll.h b/include/asm-alpha/poll.h
index 9570718..76f8935 100644
--- a/include/asm-alpha/poll.h
+++ b/include/asm-alpha/poll.h
@@ -12,8 +12,8 @@
#define POLLWRNORM (1 << 8)
#define POLLWRBAND (1 << 9)
#define POLLMSG (1 << 10)
-#define POLLREMOVE (1 << 11)
-#define POLLRDHUP (1 << 12)
+#define POLLREMOVE (1 << 12)
+#define POLLRDHUP (1 << 13)
struct pollfd {