From 8a82e0f40477cbfaf47e9366c22a47e3e4231743 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 1 Jul 2010 10:55:45 +0200 Subject: [PATCH] --- yaml --- r: 212485 b: refs/heads/master c: 9a400da84ffe7205b9921c87ac24069217442c84 h: refs/heads/master i: 212483: f7b0ef09782cb2a7657c3bfdae77dc442693de04 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a7379ef897aa..1a4c948b28c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67dd8995fd60bab890b9c3c4cd3e9f00d5811c25 +refs/heads/master: 9a400da84ffe7205b9921c87ac24069217442c84 diff --git a/trunk/arch/arm/mach-at91/board-at572d940hf_ek.c b/trunk/arch/arm/mach-at91/board-at572d940hf_ek.c index 5daff277f53e..46651623f208 100644 --- a/trunk/arch/arm/mach-at91/board-at572d940hf_ek.c +++ b/trunk/arch/arm/mach-at91/board-at572d940hf_ek.c @@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = { /* .rdy_pin = AT91_PIN_PC16, */ .enable_pin = AT91_PIN_PA15, .partition_info = nand_partitions, -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16) +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) .bus_width_16 = 1, #else .bus_width_16 = 0, diff --git a/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c b/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c index f9bf45e65cb2..ae0e0843e5f5 100644 --- a/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = { .rdy_pin = AT91_PIN_PC8, .enable_pin = AT91_PIN_PC14, .partition_info = nand_partitions, -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16) +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) .bus_width_16 = 1, #else .bus_width_16 = 0,