diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:19:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:19:21 +0100 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /arch/sh/include/asm/syscalls_32.h | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
| download | kernel_samsung_smdk4412-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.zip kernel_samsung_smdk4412-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.tar.gz kernel_samsung_smdk4412-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.tar.bz2 | |
Merge branch 'topic/quirk-cleanup' into topic/hda
Diffstat (limited to 'arch/sh/include/asm/syscalls_32.h')
| -rw-r--r-- | arch/sh/include/asm/syscalls_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index 104c5e6..8b30200 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@ -36,9 +36,9 @@ asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5, asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs); -asmlinkage int sys_pipe(unsigned long r4, unsigned long r5, - unsigned long r6, unsigned long r7, - struct pt_regs __regs); +asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5, + unsigned long r6, unsigned long r7, + struct pt_regs __regs); asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char __user *buf, size_t count, long dummy, loff_t pos); asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char __user *buf, |