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 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pcmcia
/
sa1100_shannon.c
diff --git
a/drivers/pcmcia/sa1100_shannon.c
b/drivers/pcmcia/sa1100_shannon.c
index 494912fccc0d27dd4cafd93247cc82c4fd3ad52a..46d8c1977c2a44592652fc4abfb9ce1aeb1ca3fa 100644
(file)
--- a/
drivers/pcmcia/sa1100_shannon.c
+++ b/
drivers/pcmcia/sa1100_shannon.c
@@
-9,9
+9,9
@@
#include <linux/device.h>
#include <linux/init.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
-#include <
asm/ar
ch/shannon.h>
+#include <
ma
ch/shannon.h>
#include <asm/irq.h>
#include "sa1100_generic.h"