From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Fri, 20 Nov 2009 15:57:16 +0000 (-0500)
Subject: [ARM] pxa: update flash structure in onenand info
X-Git-Tag: Ubuntu-5.10.0-12.13~30458^2~1^2~1^2~33
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d62238711a0a917ddc6bb47390c7502806c963b1;p=mirror_ubuntu-hirsute-kernel.git

[ARM] pxa: update flash structure in onenand info

Since flash structure is changed from flash_platform_data to
onenand_platform_data in generic driver. Update the struct in saar
and ttc platform driver.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---

diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index bb26cb5351df..8f49b2b12608 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/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/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c
index 926258703deb..3cccb085b979 100644
--- a/arch/arm/mach-pxa/saar.c
+++ b/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),
 };