fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/arm/lib/io-acorn.S b/arch/arm/lib/io-acorn.S
index 99378ec..1b197ea 100644 (file)
--- a/arch/arm/lib/io-acorn.S
+++ b/arch/arm/lib/io-acorn.S
@@ -12,37 +12,11 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
 
                .text
                .align
 
-               .equ    diff_pcio_base, PCIO_BASE - IO_BASE
-
-               .macro  outw2   rd
-               mov     r8, \rd, lsl #16
-               orr     r8, r8, r8, lsr #16
-               str     r8, [r3, r0, lsl #2]
-               mov     r8, \rd, lsr #16
-               orr     r8, r8, r8, lsl #16
-               str     r8, [r3, r0, lsl #2]
-               .endm
-
-               .macro  inw2    rd, mask, temp
-               ldr     \rd, [r0]
-               and     \rd, \rd, \mask
-               ldr     \temp, [r0]
-               orr     \rd, \rd, \temp, lsl #16
-               .endm
-
-               .macro  addr    rd
-               tst     \rd, #0x80000000
-               mov     \rd, \rd, lsl #2
-               add     \rd, \rd, #IO_BASE
-               addeq   \rd, \rd, #diff_pcio_base
-               .endm
-
-.iosl_warning:
+.Liosl_warning:
                .ascii  "<4>insl/outsl not implemented, called from %08lX\0"
                .align
 
@@ -52,6 +26,6 @@
  */
 ENTRY(insl)
 ENTRY(outsl)
-               adr     r0, .iosl_warning
+               adr     r0, .Liosl_warning
                mov     r1, lr
                b       printk