diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 18:43:56 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 18:43:56 +1000 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /arch/sparc/kernel/sys_sparc32.c | |
| parent | 0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff) | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
Merge branch 'linus' into next
Diffstat (limited to 'arch/sparc/kernel/sys_sparc32.c')
| -rw-r--r-- | arch/sparc/kernel/sys_sparc32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c index 6db18c6927fb..170cd8e8eb2a 100644 --- a/arch/sparc/kernel/sys_sparc32.c +++ b/arch/sparc/kernel/sys_sparc32.c @@ -109,7 +109,7 @@ asmlinkage long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compa default: return -ENOSYS; - }; + } return -ENOSYS; } |