diff --git a/[refs] b/[refs] index 6fb550a14022..fe036b4443b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1e3719e655a74065bdc5ddc58d6f1566dfe8138 +refs/heads/master: d62238711a0a917ddc6bb47390c7502806c963b1 diff --git a/trunk/arch/arm/mach-mmp/ttc_dkb.c b/trunk/arch/arm/mach-mmp/ttc_dkb.c index bb26cb5351df..8f49b2b12608 100644 --- a/trunk/arch/arm/mach-mmp/ttc_dkb.c +++ b/trunk/arch/arm/mach-mmp/ttc_dkb.c @@ -85,7 +85,7 @@ static struct mtd_partition ttc_dkb_onenand_partitions[] = { } }; -static struct flash_platform_data ttc_dkb_onenand_info = { +static struct onenand_platform_data ttc_dkb_onenand_info = { .parts = ttc_dkb_onenand_partitions, .nr_parts = ARRAY_SIZE(ttc_dkb_onenand_partitions), }; diff --git a/trunk/arch/arm/mach-pxa/saar.c b/trunk/arch/arm/mach-pxa/saar.c index 926258703deb..3cccb085b979 100644 --- a/trunk/arch/arm/mach-pxa/saar.c +++ b/trunk/arch/arm/mach-pxa/saar.c @@ -545,7 +545,7 @@ static struct mtd_partition saar_onenand_partitions[] = { } }; -static struct flash_platform_data saar_onenand_info = { +static struct onenand_platform_data saar_onenand_info = { .parts = saar_onenand_partitions, .nr_parts = ARRAY_SIZE(saar_onenand_partitions), };