diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-04 19:13:20 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-04 19:13:20 -0400 |
| commit | 17b0436077d99211d8b26886235a36c5ec54ac57 (patch) | |
| tree | 8bcd9b4a0f8285f749814e95ae0365c611ba2392 /arch/arm/mach-at91/board-sam9g20ek.c | |
| parent | aafade242ff24fac3aabf61c7861dfa44a3c2445 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
Merge commit 'v3.0' into x86/vdso
Diffstat (limited to 'arch/arm/mach-at91/board-sam9g20ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 7624cf0d006b..1325a50101a8 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
| @@ -198,7 +198,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = { | |||
| 198 | 198 | ||
| 199 | static void __init ek_add_device_nand(void) | 199 | static void __init ek_add_device_nand(void) |
| 200 | { | 200 | { |
| 201 | ek_nand_data.bus_width_16 = !board_have_nand_8bit(); | 201 | ek_nand_data.bus_width_16 = board_have_nand_16bit(); |
| 202 | /* setup bus-width (8 or 16) */ | 202 | /* setup bus-width (8 or 16) */ |
| 203 | if (ek_nand_data.bus_width_16) | 203 | if (ek_nand_data.bus_width_16) |
| 204 | ek_nand_smc_config.mode |= AT91_SMC_DBW_16; | 204 | ek_nand_smc_config.mode |= AT91_SMC_DBW_16; |