summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 09:52:05 +0200
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 09:52:05 +0200
commit66f3767376e2bbffb4c2c78ea171e1fdcb62201b (patch)
tree2006a0d4e087d34b4f8767574e36946c0254fbbc /include
parentMerge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/... (diff)
parent[ARM] Fix ARMv6 page table bits (diff)
downloadlinux-66f3767376e2bbffb4c2c78ea171e1fdcb62201b.tar.xz
linux-66f3767376e2bbffb4c2c78ea171e1fdcb62201b.zip
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/unistd.h2
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 @@
#define __NR_fstatfs64 (__NR_SYSCALL_BASE+267)
#define __NR_tgkill (__NR_SYSCALL_BASE+268)
#define __NR_utimes (__NR_SYSCALL_BASE+269)
-#define __NR_fadvise64_64 (__NR_SYSCALL_BASE+270)
+#define __NR_arm_fadvise64_64 (__NR_SYSCALL_BASE+270)
#define __NR_pciconfig_iobase (__NR_SYSCALL_BASE+271)
#define __NR_pciconfig_read (__NR_SYSCALL_BASE+272)
#define __NR_pciconfig_write (__NR_SYSCALL_BASE+273)