diff --git a/[refs] b/[refs] index 7a6aa3392bcf..b43cbe9fd4de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 273577165cd206d2d6689ee4b18aa13de1ec4bde +refs/heads/master: 7a1e524a5fe6c5bf9dd4488e946fa835fda8c3d9 diff --git a/trunk/include/asm-alpha/poll.h b/trunk/include/asm-alpha/poll.h index 95707182b3ed..76f89356b6a7 100644 --- a/trunk/include/asm-alpha/poll.h +++ b/trunk/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 {