diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-ia64/unistd.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-ia64/unistd.h')
| -rw-r--r-- | include/asm-ia64/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 441c9e001776..315f8de950a2 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -292,7 +292,7 @@ | |||
| 292 | #define __NR_sync_file_range 1300 | 292 | #define __NR_sync_file_range 1300 |
| 293 | #define __NR_tee 1301 | 293 | #define __NR_tee 1301 |
| 294 | #define __NR_vmsplice 1302 | 294 | #define __NR_vmsplice 1302 |
| 295 | /* 1303 reserved for move_pages */ | 295 | #define __NR_fallocate 1303 |
| 296 | #define __NR_getcpu 1304 | 296 | #define __NR_getcpu 1304 |
| 297 | #define __NR_epoll_pwait 1305 | 297 | #define __NR_epoll_pwait 1305 |
| 298 | #define __NR_utimensat 1306 | 298 | #define __NR_utimensat 1306 |