diff options
Diffstat (limited to 'arch/avr32/boards/atstk1000/atstk1002.c')
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 8538ba75ef9..ee4c292683e 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, @@ -96,7 +96,7 @@ static struct mtd_partition *nand_part_info(int size, int *num_partitions) return nand_partitions; } -struct atmel_nand_data atstk1006_nand_data __initdata = { +static struct atmel_nand_data atstk1006_nand_data __initdata = { .cle = 21, .ale = 22, .rdy_pin = GPIO_PIN_PB(30), |