diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-s390/unistd.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-s390/unistd.h')
| -rw-r--r-- | include/asm-s390/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h index fb6fef97d739..5c6f00d62df8 100644 --- a/include/asm-s390/unistd.h +++ b/include/asm-s390/unistd.h | |||
| @@ -250,8 +250,9 @@ | |||
| 250 | /* Number 310 is reserved for new sys_move_pages */ | 250 | /* Number 310 is reserved for new sys_move_pages */ |
| 251 | #define __NR_getcpu 311 | 251 | #define __NR_getcpu 311 |
| 252 | #define __NR_epoll_pwait 312 | 252 | #define __NR_epoll_pwait 312 |
| 253 | #define __NR_utimes 313 | ||
| 253 | 254 | ||
| 254 | #define NR_syscalls 313 | 255 | #define NR_syscalls 314 |
| 255 | 256 | ||
| 256 | /* | 257 | /* |
| 257 | * There are some system calls that are not present on 64 bit, some | 258 | * There are some system calls that are not present on 64 bit, some |