]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Remove remaining instances of nand_platform_data
authorTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2007 01:26:51 +0000 (17:26 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2007 01:26:51 +0000 (17:26 -0800)
These were left out of commit 0ed10653d529abbaf37929323926981f16d03a08.

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/mtd/nand/omap-nand-flash.c
drivers/mtd/nand/omap2.c

index a231e18b0d609063dde350ead4d69060b838e9c9..fe402794d95c017274b4af19c8bfa1d96ead410d 100644 (file)
@@ -36,7 +36,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 +76,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;
index 950a4956a7f9c7629bf6133ddfd50885f278a838..3b7307c5f9f4efd7b451a571a96c385a758c8757 100644 (file)
@@ -122,7 +122,7 @@ static struct nand_ecclayout omap_hw_eccoob = {
 
 struct omap_nand_info {
        struct nand_hw_control          controller;
-       struct nand_platform_data       *pdata;
+       struct omap_nand_platform_data  *pdata;
        struct mtd_info                 mtd;
        struct mtd_partition            *parts;
        struct nand_chip                nand;