From bd7703f7352c63bf2b6e64698acaa436069db917 Mon Sep 17 00:00:00 2001
From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri, 16 Dec 2005 11:17:29 +0900
Subject: [PATCH] --- yaml --- r: 15219 b: refs/heads/master c:
 27f4e0834746196f219e3e030ca71ffd3b176483 h: refs/heads/master i:   15217:
 f87b56331cc2c148a6d5bedaf81901a917c3ef44   15215:
 cfa82cb16b31a9978a527f2a52d90140a75bc4c2 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mtd/onenand/generic.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dbb2115cfbbb..fce35b11efb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 532a37cf8d05dd1aa5631be836036204b0d2b4a1
+refs/heads/master: 27f4e0834746196f219e3e030ca71ffd3b176483
diff --git a/trunk/drivers/mtd/onenand/generic.c b/trunk/drivers/mtd/onenand/generic.c
index 48cce431f89f..45c077d0f063 100644
--- a/trunk/drivers/mtd/onenand/generic.c
+++ b/trunk/drivers/mtd/onenand/generic.c
@@ -12,9 +12,9 @@
  *   This is a device driver for the OneNAND flash for generic boards.
  */
 
-#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/partitions.h>
@@ -39,7 +39,7 @@ static int __devinit generic_onenand_probe(struct device *dev)
 {
 	struct onenand_info *info;
 	struct platform_device *pdev = to_platform_device(dev);
-	struct onenand_platform_data *pdata = pdev->dev.platform_data;
+	struct flash_platform_data *pdata = pdev->dev.platform_data;
 	struct resource *res = pdev->resource;
 	unsigned long size = res->end - res->start + 1;
 	int err;