diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/blackfin/mach-bf561/boards | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/blackfin/mach-bf561/boards')
| -rw-r--r-- | arch/blackfin/mach-bf561/boards/acvilon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c index bfcfa86db2b5..35b6d124c1e3 100644 --- a/arch/blackfin/mach-bf561/boards/acvilon.c +++ b/arch/blackfin/mach-bf561/boards/acvilon.c | |||
| @@ -284,6 +284,7 @@ static int bfin_plat_nand_dev_ready(struct mtd_info *mtd) | |||
| 284 | 284 | ||
| 285 | static struct platform_nand_data bfin_plat_nand_data = { | 285 | static struct platform_nand_data bfin_plat_nand_data = { |
| 286 | .chip = { | 286 | .chip = { |
| 287 | .nr_chips = 1, | ||
| 287 | .chip_delay = 30, | 288 | .chip_delay = 30, |
| 288 | #ifdef CONFIG_MTD_PARTITIONS | 289 | #ifdef CONFIG_MTD_PARTITIONS |
| 289 | .part_probe_types = part_probes, | 290 | .part_probe_types = part_probes, |