X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fboard-apollon.c;h=a1132288c7015bbcaf51b0764968f9a29a72b449;hb=6469f540ea37d53db089c8fea9c0c77a3d9353d4;hp=7a2b54c7291acb6b910d3dfed15f54811b8c7df5;hpb=78f28b7c555359c67c2a0d23f7436e915329421e;p=net-next-2.6.git

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 7a2b54c7291..a1132288c70 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -87,7 +87,7 @@ static struct mtd_partition apollon_partitions[] = {
 	},
 };
 
-static struct flash_platform_data apollon_flash_data = {
+static struct onenand_platform_data apollon_flash_data = {
 	.parts		= apollon_partitions,
 	.nr_parts	= ARRAY_SIZE(apollon_partitions),
 };
@@ -99,7 +99,7 @@ static struct resource apollon_flash_resource[] = {
 };
 
 static struct platform_device apollon_onenand_device = {
-	.name		= "onenand",
+	.name		= "onenand-flash",
 	.id		= -1,
 	.dev		= {
 		.platform_data	= &apollon_flash_data,