From 67baaa08717621bf95b6d2c83d4c8db00f6e98c3 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 19 Apr 2008 15:20:23 +0100 Subject: [PATCH] --- yaml --- r: 100802 b: refs/heads/master c: d8f8eb43e9d6d5789f37c8a80db99af894944d41 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/arm/acornscsi-io.S | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index e25111dace06..bce27d63c383 100644 --- 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 index 93467e6ac923..3c5d4f8485dc 100644 --- a/trunk/drivers/scsi/arm/acornscsi-io.S +++ b/trunk/drivers/scsi/arm/acornscsi-io.S @@ -10,19 +10,6 @@ #include #include -#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