summaryrefslogtreecommitdiff
path: root/drivers/scsi/arm/acornscsi-io.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-04-19 18:13:45 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-03 17:25:56 +0400
commit324b9337f246e5f00aad10220d8d4bc13f1922ed (patch)
tree20611de47c59b158533d438297ec0e93bf0a166a /drivers/scsi/arm/acornscsi-io.S
parentd8f8eb43e9d6d5789f37c8a80db99af894944d41 (diff)
downloadlinux-324b9337f246e5f00aad10220d8d4bc13f1922ed.tar.xz
[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.S6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/arm/acornscsi-io.S b/drivers/scsi/arm/acornscsi-io.S
index 3c5d4f8485dc..5cebe3105260 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