git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pxa-palm' into pxa-machines
[safe/jmp/linux-2.6]
/
drivers
/
pcmcia
/
sa1100_jornada720.c
diff --git
a/drivers/pcmcia/sa1100_jornada720.c
b/drivers/pcmcia/sa1100_jornada720.c
index
15c31db
..
57ca085
100644
(file)
--- a/
drivers/pcmcia/sa1100_jornada720.c
+++ b/
drivers/pcmcia/sa1100_jornada720.c
@@
-10,7
+10,7
@@
#include <linux/errno.h>
#include <linux/init.h>
-#include <
asm/ar
ch/hardware.h>
+#include <
ma
ch/hardware.h>
#include <asm/hardware/sa1111.h>
#include <asm/mach-types.h>