Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/mxm8x10.c b/arch/arm/mach-pxa/mxm8x10.c
index a13a1e365851..83570a79e7d2 100644
--- a/arch/arm/mach-pxa/mxm8x10.c
+++ b/arch/arm/mach-pxa/mxm8x10.c
@@ -389,10 +389,11 @@ static struct mtd_partition mxm_8x10_nand_partitions[] = {
 };
 
 static struct pxa3xx_nand_platform_data mxm_8x10_nand_info = {
-        .enable_arbiter = 1,
-        .keep_config = 1,
-        .parts = mxm_8x10_nand_partitions,
-        .nr_parts = ARRAY_SIZE(mxm_8x10_nand_partitions)
+        .enable_arbiter = 1,
+        .keep_config    = 1,
+        .num_cs         = 1,
+        .parts[0]       = mxm_8x10_nand_partitions,
+        .nr_parts[0]    = ARRAY_SIZE(mxm_8x10_nand_partitions)
 };
 
 static void __init mxm_8x10_nand_init(void)