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 branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
drivers
/
pcmcia
/
sa1100_assabet.c
diff --git
a/drivers/pcmcia/sa1100_assabet.c
b/drivers/pcmcia/sa1100_assabet.c
index
ce133ce
..
f424146
100644
(file)
--- a/
drivers/pcmcia/sa1100_assabet.c
+++ b/
drivers/pcmcia/sa1100_assabet.c
@@
-11,11
+11,11
@@
#include <linux/device.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/init.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/signal.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/signal.h>
-#include <
asm/ar
ch/assabet.h>
+#include <
ma
ch/assabet.h>
#include "sa1100_generic.h"
#include "sa1100_generic.h"