diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
| commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
| tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /include/asm-powerpc/poll.h | |
| parent | 0b968d23610d65a46299347b141a687e207bd294 (diff) | |
| parent | b2ad7b5e8115582cdf5bbda065aa516c24d62c21 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/asm-powerpc/poll.h')
| -rw-r--r-- | include/asm-powerpc/poll.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/poll.h b/include/asm-powerpc/poll.h index be5024913c62..edd2054da86b 100644 --- a/include/asm-powerpc/poll.h +++ b/include/asm-powerpc/poll.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __PPC_POLL_H | 1 | #ifndef _ASM_POWERPC_POLL_H |
| 2 | #define __PPC_POLL_H | 2 | #define _ASM_POWERPC_POLL_H |
| 3 | 3 | ||
| 4 | #define POLLIN 0x0001 | 4 | #define POLLIN 0x0001 |
| 5 | #define POLLPRI 0x0002 | 5 | #define POLLPRI 0x0002 |
| @@ -20,4 +20,4 @@ struct pollfd { | |||
| 20 | short revents; | 20 | short revents; |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | #endif | 23 | #endif /* _ASM_POWERPC_POLL_H */ |