projects
/
cascardo
/
linux.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 master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
drivers
/
pcmcia
/
at91_cf.c
diff --git
a/drivers/pcmcia/at91_cf.c
b/drivers/pcmcia/at91_cf.c
index
b674630
..
52d4a38
100644
(file)
--- a/
drivers/pcmcia/at91_cf.c
+++ b/
drivers/pcmcia/at91_cf.c
@@
-23,9
+23,9
@@
#include <asm/io.h>
#include <asm/sizes.h>
-#include <asm/arch/at91rm9200.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
+#include <asm/arch/at91rm9200_mc.h>
/*