[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 080-mtd_plat_nand_chip_fixup.patch

diff --git a/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch
index 2b8954c..62d96ac 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/mtd/nand.h
 +++ b/include/linux/mtd/nand.h
 --- a/include/linux/mtd/nand.h
 +++ b/include/linux/mtd/nand.h

-@@ -578,6 +578,7 @@
+@@ -578,6 +578,7 @@ struct platform_nand_chip {

        int                     chip_delay;
        unsigned int            options;
        const char              **part_probe_types;
        int                     chip_delay;
        unsigned int            options;
        const char              **part_probe_types;


@@ -10,7 +10,7 @@
  
 --- a/drivers/mtd/nand/plat_nand.c
 +++ b/drivers/mtd/nand/plat_nand.c
  
 --- a/drivers/mtd/nand/plat_nand.c
 +++ b/drivers/mtd/nand/plat_nand.c

-@@ -71,7 +71,18 @@
+@@ -71,7 +71,18 @@ static int __init plat_nand_probe(struct

        platform_set_drvdata(pdev, data);
  
        /* Scan to find existance of the device */
        platform_set_drvdata(pdev, data);
  
        /* Scan to find existance of the device */