diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
| commit | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (patch) | |
| tree | a5dd723679582505ef3905c90f0c2c032d191b94 /arch/sh/kernel/syscalls_32.S | |
| parent | 526b264163068f77c5f2409031f5e25caf3900a9 (diff) | |
| parent | c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb (diff) | |
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
Diffstat (limited to 'arch/sh/kernel/syscalls_32.S')
| -rw-r--r-- | arch/sh/kernel/syscalls_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S index 39b051de4c7c..293e39c59c00 100644 --- a/arch/sh/kernel/syscalls_32.S +++ b/arch/sh/kernel/syscalls_32.S | |||
| @@ -185,7 +185,7 @@ ENTRY(sys_call_table) | |||
| 185 | .long sys_ni_syscall /* vm86 */ | 185 | .long sys_ni_syscall /* vm86 */ |
| 186 | .long sys_ni_syscall /* old "query_module" */ | 186 | .long sys_ni_syscall /* old "query_module" */ |
| 187 | .long sys_poll | 187 | .long sys_poll |
| 188 | .long sys_nfsservctl | 188 | .long sys_ni_syscall /* was nfsservctl */ |
| 189 | .long sys_setresgid16 /* 170 */ | 189 | .long sys_setresgid16 /* 170 */ |
| 190 | .long sys_getresgid16 | 190 | .long sys_getresgid16 |
| 191 | .long sys_prctl | 191 | .long sys_prctl |