diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:52:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:52:05 -0400 |
| commit | 66f3767376e2bbffb4c2c78ea171e1fdcb62201b (patch) | |
| tree | 2006a0d4e087d34b4f8767574e36946c0254fbbc /include | |
| parent | 5d8c397f304e1363f8ff9749b08172eb59e6534a (diff) | |
| parent | 86a8a83963a3f6beeca4900d26da93c7d2a9d92d (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index 94619ccee789..278de61224d1 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h | |||
| @@ -295,7 +295,7 @@ | |||
| 295 | #define __NR_fstatfs64 (__NR_SYSCALL_BASE+267) | 295 | #define __NR_fstatfs64 (__NR_SYSCALL_BASE+267) |
| 296 | #define __NR_tgkill (__NR_SYSCALL_BASE+268) | 296 | #define __NR_tgkill (__NR_SYSCALL_BASE+268) |
| 297 | #define __NR_utimes (__NR_SYSCALL_BASE+269) | 297 | #define __NR_utimes (__NR_SYSCALL_BASE+269) |
| 298 | #define __NR_fadvise64_64 (__NR_SYSCALL_BASE+270) | 298 | #define __NR_arm_fadvise64_64 (__NR_SYSCALL_BASE+270) |
| 299 | #define __NR_pciconfig_iobase (__NR_SYSCALL_BASE+271) | 299 | #define __NR_pciconfig_iobase (__NR_SYSCALL_BASE+271) |
| 300 | #define __NR_pciconfig_read (__NR_SYSCALL_BASE+272) | 300 | #define __NR_pciconfig_read (__NR_SYSCALL_BASE+272) |
| 301 | #define __NR_pciconfig_write (__NR_SYSCALL_BASE+273) | 301 | #define __NR_pciconfig_write (__NR_SYSCALL_BASE+273) |