diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /include/asm-i386/poll.h | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'include/asm-i386/poll.h')
| -rw-r--r-- | include/asm-i386/poll.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/poll.h b/include/asm-i386/poll.h index aecc80a15d36..2cd4929abd40 100644 --- a/include/asm-i386/poll.h +++ b/include/asm-i386/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; |