diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:37 +0200 |
| commit | 3557b18fcbe0e29706214f3c7cc680a7823605eb (patch) | |
| tree | 2a70696b78a9e8b5ba38090901301931d395ecfb /arch/blackfin/lib/outs.S | |
| parent | x86: use pteval_t for _PAGE_FOO (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-3557b18fcbe0e29706214f3c7cc680a7823605eb.tar.xz linux-3557b18fcbe0e29706214f3c7cc680a7823605eb.zip | |
Merge branch 'linus' into x86/ptemask
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) |