Fix NAND compilation after update to 2.6.24. nand_platform_data doesn't exist any more.

Signed-off-by: Dirk Behme <[EMAIL PROTECTED]>

Index: linux-davinci/arch/arm/mach-davinci/board-evm.c
===================================================================
--- linux-davinci.orig/arch/arm/mach-davinci/board-evm.c
+++ linux-davinci/arch/arm/mach-davinci/board-evm.c
@@ -106,7 +106,7 @@ struct mtd_partition davinci_evm_nandfla
        }
 };
 
-static struct nand_platform_data davinci_evm_nandflash_data = {
+static struct flash_platform_data davinci_evm_nandflash_data = {
        .parts          = davinci_evm_nandflash_partition,
        .nr_parts       = ARRAY_SIZE(davinci_evm_nandflash_partition),
 };
Index: linux-davinci/drivers/mtd/nand/davinci_nand.c
===================================================================
--- linux-davinci.orig/drivers/mtd/nand/davinci_nand.c
+++ linux-davinci/drivers/mtd/nand/davinci_nand.c
@@ -474,7 +474,7 @@ static void __devinit nand_davinci_flash
  */
 int __devinit nand_davinci_probe(struct platform_device *pdev)
 {
-       struct nand_platform_data *pdata = pdev->dev.platform_data;
+       struct flash_platform_data *pdata = pdev->dev.platform_data;
        struct resource           *res = pdev->resource;
        struct nand_chip          *chip;
        struct device             *dev = NULL;

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply via email to