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 'move-atmel-mci-h' into boards
[safe/jmp/linux-2.6]
/
arch
/
avr32
/
boards
/
mimc200
/
setup.c
diff --git
a/arch/avr32/boards/mimc200/setup.c
b/arch/avr32/boards/mimc200/setup.c
index
c060d4d
..
2b58d61
100644
(file)
--- a/
arch/avr32/boards/mimc200/setup.c
+++ b/
arch/avr32/boards/mimc200/setup.c
@@
-24,7
+24,7
@@
extern struct atmel_lcdfb_info mimc200_lcdc_data;
#include <video/atmel_lcdc.h>
#include <linux/fb.h>
-#include <
asm
/atmel-mci.h>
+#include <
linux
/atmel-mci.h>
#include <linux/io.h>
#include <asm/setup.h>