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/mach-at32ap | |
| parent | dd5e1339e528197abdb7827663ff0673797fa088 (diff) | |
| parent | c42aa775cc8a8ca558db0cc75979fb8e16667447 (diff) | |
| download | linux-0e490050902adaca9b30275ec9a544a786bf2db8.tar.xz | |
Merge branch 'move-atmel-mci-h' into boards
Diffstat (limited to 'arch/avr32/mach-at32ap')
| -rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index b3293bf77e94..ea7bc1e8562b 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c @@ -15,8 +15,8 @@ #include <linux/gpio.h> #include <linux/spi/spi.h> #include <linux/usb/atmel_usba_udc.h> +#include <linux/atmel-mci.h> -#include <asm/atmel-mci.h> #include <asm/io.h> #include <asm/irq.h> |