diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 00:52:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 00:52:05 -0700 |
commit | 66f3767376e2bbffb4c2c78ea171e1fdcb62201b (patch) | |
tree | 2006a0d4e087d34b4f8767574e36946c0254fbbc /arch/arm/kernel/calls.S | |
parent | 5d8c397f304e1363f8ff9749b08172eb59e6534a (diff) | |
parent | 86a8a83963a3f6beeca4900d26da93c7d2a9d92d (diff) |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/calls.S')
-rw-r--r-- | arch/arm/kernel/calls.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 2b6b4c786e6..db07ce42b3b 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -284,7 +284,7 @@ __syscall_start: .long sys_fstatfs64 .long sys_tgkill .long sys_utimes -/* 270 */ .long sys_fadvise64_64 +/* 270 */ .long sys_arm_fadvise64_64_wrapper .long sys_pciconfig_iobase .long sys_pciconfig_read .long sys_pciconfig_write |