diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /include/asm-i386/unistd.h | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'include/asm-i386/unistd.h')
| -rw-r--r-- | include/asm-i386/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index 3ca7ab963d7d..beeeaf6b054a 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h | |||
| @@ -324,10 +324,11 @@ | |||
| 324 | #define __NR_vmsplice 316 | 324 | #define __NR_vmsplice 316 |
| 325 | #define __NR_move_pages 317 | 325 | #define __NR_move_pages 317 |
| 326 | #define __NR_getcpu 318 | 326 | #define __NR_getcpu 318 |
| 327 | #define __NR_epoll_pwait 319 | ||
| 327 | 328 | ||
| 328 | #ifdef __KERNEL__ | 329 | #ifdef __KERNEL__ |
| 329 | 330 | ||
| 330 | #define NR_syscalls 319 | 331 | #define NR_syscalls 320 |
| 331 | #include <linux/err.h> | 332 | #include <linux/err.h> |
| 332 | 333 | ||
| 333 | /* | 334 | /* |