diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 16:30:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 16:30:35 -0800 |
| commit | 9cf93d7b2f4516271ccf5b48f958bd474cf9dd67 (patch) | |
| tree | e743282bdf6b808cc7739c614fc7158609470ace /arch/arm/lib/io-acorn.S | |
| parent | 401221501af4b87b502eca36ece97b4191380082 (diff) | |
| parent | c6bd2328434a3a6f8f6bc6f77f49c12ec966448a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/lib/io-acorn.S')
| -rw-r--r-- | arch/arm/lib/io-acorn.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/io-acorn.S b/arch/arm/lib/io-acorn.S index 3aacd01d40e..b153523631c 100644 --- a/arch/arm/lib/io-acorn.S +++ b/arch/arm/lib/io-acorn.S @@ -17,7 +17,7 @@ .text .align -.iosl_warning: +.Liosl_warning: .ascii "<4>insl/outsl not implemented, called from %08lX\0" .align @@ -27,6 +27,6 @@ */ ENTRY(insl) ENTRY(outsl) - adr r0, .iosl_warning + adr r0, .Liosl_warning mov r1, lr b printk |