diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
| commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
| tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /arch/frv/kernel/entry.S | |
| parent | 8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff) | |
| parent | 00c46b3069c1ee9aa31db3057e9224685af52efa (diff) | |
| download | blackbird-op-linux-ceb1c532ba6220900e61ec7073a9234661efa450.tar.gz blackbird-op-linux-ceb1c532ba6220900e61ec7073a9234661efa450.zip | |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'arch/frv/kernel/entry.S')
| -rw-r--r-- | arch/frv/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 017d6d7b784f..5ba23f715ea5 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S @@ -1358,7 +1358,7 @@ sys_call_table: .long sys_ni_syscall /* for vm86 */ .long sys_ni_syscall /* Old sys_query_module */ .long sys_poll - .long sys_nfsservctl + .long sys_ni_syscall /* Old nfsservctl */ .long sys_setresgid16 /* 170 */ .long sys_getresgid16 .long sys_prctl |
