From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Fri, 20 Aug 2010 17:18:04 +0200 Subject: [PATCH] AT91: Correct configuration define value In-Reply-To: <1277974545-30331-1-git-send-email-nicolas.ferre@atmel.com> References: <4c6fe9a4c298214223ff89d06401ac7b66f81c98.1277911346.git.siccegge@cs.fau.de> <1277974545-30331-1-git-send-email-nicolas.ferre@atmel.com> Message-ID: <4C6E9CAC.4000404@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Le 01/07/2010 10:55, Nicolas Ferre : > The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore. > Change wrong configuration variables that were remaining. > > Reported-by: Christoph Egger > Signed-off-by: Nicolas Ferre We can add: Acked-by: Kirill A. Shutemov > --- > Christoph, Christoph, Is this patch handled by you as part of your patch series or should I include it in "Trivial" or "AT91" patch series? Bye, > Thank you for highlighting this. But please consider this > patch instead of yours. > > arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +- > arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c > index 5daff27..4665162 100644 > --- a/arch/arm/mach-at91/board-at572d940hf_ek.c > +++ b/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/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c > index ee80059..37af9b1 100644 > --- a/arch/arm/mach-at91/board-sam9m10g45ek.c > +++ b/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, -- Nicolas Ferre