diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:17 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:17 +0200 |
commit | 9583f3d9c00974911daf227cbaa12d6c1caaabad (patch) | |
tree | f37466204ecbfea37c7d567fd06c9bece0cc663d /arch/blackfin/lib/outs.S | |
parent | Remove argument from open_softirq which is always NULL (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
download | linux-9583f3d9c00974911daf227cbaa12d6c1caaabad.tar.xz linux-9583f3d9c00974911daf227cbaa12d6c1caaabad.zip |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'arch/blackfin/lib/outs.S')
-rw-r--r-- | arch/blackfin/lib/outs.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S index 3daf96035bf6..4685b7aa0080 100644 --- a/arch/blackfin/lib/outs.S +++ b/arch/blackfin/lib/outs.S @@ -76,4 +76,4 @@ ENTRY(_outsw_8) R0 = R0 + R1; .Lword8_loop_e: W[P0] = R0; RTS; -ENDPROC(_outsw) +ENDPROC(_outsw_8) |