From c1d4a9260757ec801c6c301b6e1098d8b183b9f0 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 16 Jul 2008 08:46:08 +0200 Subject: [PATCH] --- yaml --- r: 107515 b: refs/heads/master c: 221d62c1882d05fc20163347d7e6af279bdffb8e h: refs/heads/master i: 107513: 558d24c22201f98eaadce26e4c05413f869ccb05 107511: 840cffcf6bbced27df3f2eb050104b9e098a0de2 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/board-qil-a9260.c | 2 +- trunk/arch/arm/mach-at91/board-sam9g20ek.c | 2 +- trunk/arch/arm/mach-at91/board-usb-a9260.c | 2 +- trunk/arch/arm/mach-at91/board-usb-a9263.c | 2 +- trunk/arch/arm/mm/Kconfig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7237b50b5fcd..b75b4b17f610 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c896834735f497cc405068d16a51717f993af7f +refs/heads/master: 221d62c1882d05fc20163347d7e6af279bdffb8e diff --git a/trunk/arch/arm/mach-at91/board-qil-a9260.c b/trunk/arch/arm/mach-at91/board-qil-a9260.c index f847a53b4eb6..99b4ec3818d6 100644 --- a/trunk/arch/arm/mach-at91/board-qil-a9260.c +++ b/trunk/arch/arm/mach-at91/board-qil-a9260.c @@ -140,7 +140,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio return ek_nand_partition; } -static struct atmel_nand_data __initdata ek_nand_data = { +static struct at91_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected diff --git a/trunk/arch/arm/mach-at91/board-sam9g20ek.c b/trunk/arch/arm/mach-at91/board-sam9g20ek.c index a751a7d615cf..45617c201240 100644 --- a/trunk/arch/arm/mach-at91/board-sam9g20ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9g20ek.c @@ -143,7 +143,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio } /* det_pin is not connected */ -static struct atmel_nand_data __initdata ek_nand_data = { +static struct at91_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, .rdy_pin = AT91_PIN_PC13, diff --git a/trunk/arch/arm/mach-at91/board-usb-a9260.c b/trunk/arch/arm/mach-at91/board-usb-a9260.c index 0339a7b6f049..837aedf8ffeb 100644 --- a/trunk/arch/arm/mach-at91/board-usb-a9260.c +++ b/trunk/arch/arm/mach-at91/board-usb-a9260.c @@ -114,7 +114,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio return ek_nand_partition; } -static struct atmel_nand_data __initdata ek_nand_data = { +static struct at91_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected diff --git a/trunk/arch/arm/mach-at91/board-usb-a9263.c b/trunk/arch/arm/mach-at91/board-usb-a9263.c index 128570669812..95800d32bd49 100644 --- a/trunk/arch/arm/mach-at91/board-usb-a9263.c +++ b/trunk/arch/arm/mach-at91/board-usb-a9263.c @@ -127,7 +127,7 @@ static struct mtd_partition * __init nand_partitions(int size, int *num_partitio return ek_nand_partition; } -static struct atmel_nand_data __initdata ek_nand_data = { +static struct at91_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig index 3a6c8ec34cd9..399d1d66bf93 100644 --- a/trunk/arch/arm/mm/Kconfig +++ b/trunk/arch/arm/mm/Kconfig @@ -187,7 +187,7 @@ config CPU_ARM926T ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ - ARCH_NS9XXX || ARCH_DAVINCI + ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2 default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ ARCH_OMAP730 || ARCH_OMAP16XX || \ ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \