---

yaml --- r: 100802 b: refs/heads/master c: d8f8eb4 h: refs/heads/master v: v3
git-mirror · Jul 3, 2008 · 67baaa0 · 67baaa0
1 parent 35dd585
commit 67baaa0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36149f02cb830570ca57228c8ad3d82742485eb7
+refs/heads/master: d8f8eb43e9d6d5789f37c8a80db99af894944d41
diff --git a/trunk/drivers/scsi/arm/acornscsi-io.S b/trunk/drivers/scsi/arm/acornscsi-io.S
@@ -10,19 +10,6 @@
 #include <asm/assembler.h>
 #include <asm/hardware.h>
 
-#if (IO_BASE == (PCIO_BASE & 0xff000000))
-#define ADDR(off,reg)						\
-		tst	off, $0x80000000			;\
-		mov	reg, $IO_BASE				;\
-		orreq	reg, reg, $(PCIO_BASE & 0x00ff0000)
-#else
-#define ADDR(off,reg)						\
-		tst	off, $0x80000000			;\
-		movne	reg, $IO_BASE				;\
-		moveq	reg, $(PCIO_BASE & 0xff000000)		;\
-		orreq	reg, reg, $(PCIO_BASE & 0x00ff0000)
-#endif
-
 @ Purpose: transfer a block of data from the acorn scsi card to memory
 @ Proto  : void acornscsi_in(unsigned int addr_start, char *buffer, int length)
 @ Returns: nothing