diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-05 02:54:18 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-05 02:54:18 +0400 |
| commit | fc52693f8f54485af29be1adc90ce2bd54ad325f (patch) | |
| tree | 95ffbab75003d6da6a516a8956734bb7e3e5cb62 /arch/arm/mach-at91/board-sam9g20ek.c | |
| parent | aababb9766f0e874da26a17acbbec867bf9501f0 (diff) | |
| parent | 64393b3ae4e3cc86e2d622f682d736ec973364b6 (diff) | |
| download | linux-fc52693f8f54485af29be1adc90ce2bd54ad325f.tar.xz | |
Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc
* 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc:
AT91: Change nand buswidth logic to match hardware default configuration
at91: Use "pclk" as con_id on at91cap9 and at91rm9200
at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
atmel_serial: fix internal port num
at91: fix at91_set_serial_console: use platform device id
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 = { static void __init ek_add_device_nand(void) { - ek_nand_data.bus_width_16 = !board_have_nand_8bit(); + ek_nand_data.bus_width_16 = board_have_nand_16bit(); /* setup bus-width (8 or 16) */ if (ek_nand_data.bus_width_16) ek_nand_smc_config.mode |= AT91_SMC_DBW_16; |