diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
| commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
| tree | bc16200f3b6ea150b298422754e32959eaa339bc /arch/arm/mach-pxa/zylonite.c | |
| parent | 951c486f62490e032da0ad17e93270b0cfb6687f (diff) | |
| parent | 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe (diff) | |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'arch/arm/mach-pxa/zylonite.c')
| -rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 2406fd2727ef..a4c807527095 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
| @@ -366,8 +366,9 @@ static struct mtd_partition zylonite_nand_partitions[] = { | |||
| 366 | 366 | ||
| 367 | static struct pxa3xx_nand_platform_data zylonite_nand_info = { | 367 | static struct pxa3xx_nand_platform_data zylonite_nand_info = { |
| 368 | .enable_arbiter = 1, | 368 | .enable_arbiter = 1, |
| 369 | .parts = zylonite_nand_partitions, | 369 | .num_cs = 1, |
| 370 | .nr_parts = ARRAY_SIZE(zylonite_nand_partitions), | 370 | .parts[0] = zylonite_nand_partitions, |
| 371 | .nr_parts[0] = ARRAY_SIZE(zylonite_nand_partitions), | ||
| 371 | }; | 372 | }; |
| 372 | 373 | ||
| 373 | static void __init zylonite_init_nand(void) | 374 | static void __init zylonite_init_nand(void) |