diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 09:55:16 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 09:55:16 +0100 |
commit | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (patch) | |
tree | 3d053e76542ad4d20bd83ad35c13eabff97003ab /arch/avr32/boards/atstk1000/atstk1002.c | |
parent | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (diff) | |
parent | 3663b736a5083b3bce74520b637f630f01f66a7f (diff) |
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'arch/avr32/boards/atstk1000/atstk1002.c')
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 8538ba75ef9..b33542b9756 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -23,10 +23,10 @@ #include <asm/setup.h> #include <asm/atmel-mci.h> -#include <asm/arch/at32ap700x.h> -#include <asm/arch/board.h> -#include <asm/arch/init.h> -#include <asm/arch/portmux.h> +#include <mach/at32ap700x.h> +#include <mach/board.h> +#include <mach/init.h> +#include <mach/portmux.h> #include "atstk1000.h" @@ -49,7 +49,7 @@ unsigned long at32_board_osc_rates[3] = { */ #ifdef CONFIG_BOARD_ATSTK1006 #include <linux/mtd/partitions.h> -#include <asm/arch/smc.h> +#include <mach/smc.h> static struct smc_timing nand_timing __initdata = { .ncs_read_setup = 0, |