diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 22:06:36 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 22:06:36 +0100 |
commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-at91/board-at572d940hf_ek.c | |
parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
download | kernel_samsung_smdk4412-809b4e00baf006a990a73329ba381d536c6fa277.zip kernel_samsung_smdk4412-809b4e00baf006a990a73329ba381d536c6fa277.tar.gz kernel_samsung_smdk4412-809b4e00baf006a990a73329ba381d536c6fa277.tar.bz2 |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-at91/board-at572d940hf_ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-at572d940hf_ek.c | 2 |
1 files changed, 1 insertions, 1 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, |