diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-01-05 18:36:07 +0300 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-01-05 18:36:07 +0300 |
commit | 0e490050902adaca9b30275ec9a544a786bf2db8 (patch) | |
tree | 298a849df99a95ed42c37234d78a1aff1358c724 /arch/avr32/boards/atstk1000/atstk1002.c | |
parent | dd5e1339e528197abdb7827663ff0673797fa088 (diff) | |
parent | c42aa775cc8a8ca558db0cc75979fb8e16667447 (diff) | |
download | linux-0e490050902adaca9b30275ec9a544a786bf2db8.tar.xz |
Merge branch 'move-atmel-mci-h' into boards
Diffstat (limited to 'arch/avr32/boards/atstk1000/atstk1002.c')
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 11e7800c1632..1f33a106905c 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -16,12 +16,12 @@ #include <linux/types.h> #include <linux/spi/spi.h> #include <linux/spi/at73c213.h> +#include <linux/atmel-mci.h> #include <video/atmel_lcdc.h> #include <asm/io.h> #include <asm/setup.h> -#include <asm/atmel-mci.h> #include <mach/at32ap700x.h> #include <mach/board.h> |