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/cm-x300.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/cm-x300.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 21ac8e3e2f7a..684acf6ed3d5 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
| @@ -424,8 +424,9 @@ static struct mtd_partition cm_x300_nand_partitions[] = { | |||
| 424 | static struct pxa3xx_nand_platform_data cm_x300_nand_info = { | 424 | static struct pxa3xx_nand_platform_data cm_x300_nand_info = { |
| 425 | .enable_arbiter = 1, | 425 | .enable_arbiter = 1, |
| 426 | .keep_config = 1, | 426 | .keep_config = 1, |
| 427 | .parts = cm_x300_nand_partitions, | 427 | .num_cs = 1, |
| 428 | .nr_parts = ARRAY_SIZE(cm_x300_nand_partitions), | 428 | .parts[0] = cm_x300_nand_partitions, |
| 429 | .nr_parts[0] = ARRAY_SIZE(cm_x300_nand_partitions), | ||
| 429 | }; | 430 | }; |
| 430 | 431 | ||
| 431 | static void __init cm_x300_init_nand(void) | 432 | static void __init cm_x300_init_nand(void) |