Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / lib / io-acorn.S

diff --git a/arch/arm/lib/io-acorn.S b/arch/arm/lib/io-acorn.S
index 3aacd01d40e1ccd269d57c64922aac08597f3025..1b197ea7aab3a7a074624f1f9b5e0acafc4cac50 100644 (file)
--- a/arch/arm/lib/io-acorn.S
+++ b/arch/arm/lib/io-acorn.S
@@ -12,12 +12,11 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
 
                .text
                .align
 
-.iosl_warning:
+.Liosl_warning:
                .ascii  "<4>insl/outsl not implemented, called from %08lX\0"
                .align
 
@@ -27,6 +26,6 @@
  */
 ENTRY(insl)
 ENTRY(outsl)
-               adr     r0, .iosl_warning
+               adr     r0, .Liosl_warning
                mov     r1, lr
                b       printk