projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
arm
/
acornscsi-io.S
diff --git
a/drivers/scsi/arm/acornscsi-io.S
b/drivers/scsi/arm/acornscsi-io.S
index 5cebe3105260204ba1b8bb9eb89980334ec039e8..22171b2110a852cfd2fadc611e3220f39dbb349b 100644
(file)
--- a/
drivers/scsi/arm/acornscsi-io.S
+++ b/
drivers/scsi/arm/acornscsi-io.S
@@
-8,7
+8,7
@@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#if defined(__APCS_32__)
#define LOADREGS(t,r,l...) ldm##t r, l
#if defined(__APCS_32__)
#define LOADREGS(t,r,l...) ldm##t r, l