git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
pcmcia
/
sa1100_shannon.c
diff --git
a/drivers/pcmcia/sa1100_shannon.c
b/drivers/pcmcia/sa1100_shannon.c
index
16b0427
..
46d8c19
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/ar
ch/hardware.h>
+#include <
ma
ch/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"