Prev: [PATCH 2/2] USB: gadget: mass/file storage: set serial number
Next: [PATCH/RFC 2/2] USB: gadget: g_experimantal: Experimental Composite Gadget
From: Kirill A. Shutemov on 1 Jul 2010 05:20
On Thu, Jul 01, 2010 at 10:55:45AM +0200, Nicolas Ferre wrote:
> The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> Change wrong configuration variables that were remaining.

Acked-by: Kirill A. Shutemov <kirill(a)shutemov.name>

> Reported-by: Christoph Egger <siccegge(a)cs.fau.de>
> Signed-off-by: Nicolas Ferre <nicolas.ferre(a)atmel.com>
> ---
> Christoph,
>
> 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,
> --
> 1.5.6.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel(a)lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 2/2] USB: gadget: mass/file storage: set serial number
Next: [PATCH/RFC 2/2] USB: gadget: g_experimantal: Experimental Composite Gadget