diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
| commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
| tree | 28369f5a844535ff836565eefd62695b0e890fa3 /include/asm-parisc/poll.h | |
| parent | 200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff) | |
| parent | 55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-parisc/poll.h')
| -rw-r--r-- | include/asm-parisc/poll.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-parisc/poll.h b/include/asm-parisc/poll.h index 1c1da86934cf..20e4d03c74cb 100644 --- a/include/asm-parisc/poll.h +++ b/include/asm-parisc/poll.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #define POLLWRBAND 0x0200 | 16 | #define POLLWRBAND 0x0200 |
| 17 | #define POLLMSG 0x0400 | 17 | #define POLLMSG 0x0400 |
| 18 | #define POLLREMOVE 0x1000 | 18 | #define POLLREMOVE 0x1000 |
| 19 | #define POLLRDHUP 0x2000 | ||
| 19 | 20 | ||
| 20 | struct pollfd { | 21 | struct pollfd { |
| 21 | int fd; | 22 | int fd; |