diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 15:13:45 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-03 14:25:56 +0100 |
commit | 324b9337f246e5f00aad10220d8d4bc13f1922ed (patch) | |
tree | 20611de47c59b158533d438297ec0e93bf0a166a /drivers/scsi/arm/acornscsi-io.S | |
parent | d8f8eb43e9d6d5789f37c8a80db99af894944d41 (diff) |
[ARM] rpc: acornscsi: fixup abort/reset methods, fix build errors
Revive the AcornSCSI driver, update it for the replacement command
abort and host reset methods, and fix the build errors in
acornscsi-io.S.
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/scsi/arm/acornscsi-io.S')
-rw-r--r-- | drivers/scsi/arm/acornscsi-io.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/arm/acornscsi-io.S b/drivers/scsi/arm/acornscsi-io.S index 3c5d4f8485d..5cebe310526 100644 --- a/drivers/scsi/arm/acornscsi-io.S +++ b/drivers/scsi/arm/acornscsi-io.S @@ -10,6 +10,12 @@ #include <asm/assembler.h> #include <asm/hardware.h> +#if defined(__APCS_32__) +#define LOADREGS(t,r,l...) ldm##t r, l +#elif defined(__APCS_26__) +#define LOADREGS(t,r,l...) ldm##t r, l##^ +#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 |