diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-01-05 10:36:07 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-01-05 10:36:07 -0500 |
| commit | 0e490050902adaca9b30275ec9a544a786bf2db8 (patch) | |
| tree | 298a849df99a95ed42c37234d78a1aff1358c724 /arch/avr32/boards/mimc200 | |
| parent | dd5e1339e528197abdb7827663ff0673797fa088 (diff) | |
| parent | c42aa775cc8a8ca558db0cc75979fb8e16667447 (diff) | |
Merge branch 'move-atmel-mci-h' into boards
Diffstat (limited to 'arch/avr32/boards/mimc200')
| -rw-r--r-- | arch/avr32/boards/mimc200/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c index c060d4d2839e..2b58d61f0afc 100644 --- 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; | |||
| 24 | #include <video/atmel_lcdc.h> | 24 | #include <video/atmel_lcdc.h> |
| 25 | #include <linux/fb.h> | 25 | #include <linux/fb.h> |
| 26 | 26 | ||
| 27 | #include <asm/atmel-mci.h> | 27 | #include <linux/atmel-mci.h> |
| 28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 29 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
| 30 | 30 | ||