summaryrefslogtreecommitdiff
path: root/arch/blackfin/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-16 11:12:23 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-16 11:12:23 +0200
commitcfcfdff59b411249d7c660dcf08a9a3f3df9e641 (patch)
treec12d4e2a03dacd62e4656991bdff64c20eca8c1c /arch/blackfin/lib
parentd3794979a8a80c222ce9d016a6dfc4bed36965d0 (diff)
parent066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff)
Merge branch 'linus' into core/percputip-core-percpu-2008-06-16_09.12_Mon
Diffstat (limited to 'arch/blackfin/lib')
-rw-r--r--arch/blackfin/lib/outs.S2
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)