Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / mtd / nand / omap-nand-flash.c

diff --git a/drivers/mtd/nand/omap-nand-flash.c b/drivers/mtd/nand/omap-nand-flash.c
index a231e18b0d609063dde350ead4d69060b838e9c9..63a79682802ab4bd6cf7f1323036e87fb7c32429 100644 (file)
--- a/drivers/mtd/nand/omap-nand-flash.c
+++ b/drivers/mtd/nand/omap-nand-flash.c
@@ -21,13 +21,14 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/io.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/flash.h>
-#include <asm/arch/tc.h>
+#include <mach/tc.h>
 
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
+#include <mach/nand.h>
 
 #define        DRIVER_NAME     "omapnand"
 
@@ -36,7 +37,7 @@ static const char *part_probes[] = { "cmdlinepart", NULL };
 #endif
 
 struct omap_nand_info {
-       struct nand_platform_data *pdata;
+       struct omap_nand_platform_data *pdata;
        struct mtd_partition    *parts;
        struct mtd_info         mtd;
        struct nand_chip        nand;
@@ -76,7 +77,7 @@ static int omap_nand_dev_ready(struct mtd_info *mtd)
 static int __devinit omap_nand_probe(struct platform_device *pdev)
 {
        struct omap_nand_info           *info;
-       struct nand_platform_data       *pdata = pdev->dev.platform_data;
+       struct omap_nand_platform_data  *pdata = pdev->dev.platform_data;
        struct resource                 *res = pdev->resource;
        unsigned long                   size = res->end - res->start + 1;
        int                             err;