[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 910-m25p80_redboot_partitions.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch b/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
index 5f35f00..2972514 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/910-m25p80_redboot_partitions.patch
@@ -1,7 +1,6 @@
-diff -Nur a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
---- a/drivers/mtd/devices/m25p80.c     2008-07-06 14:36:59.000000000 +0200
-+++ b/drivers/mtd/devices/m25p80.c     2008-07-06 15:17:48.000000000 +0200
-@@ -631,12 +631,10 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -627,12 +627,10 @@ static int __devinit m25p_probe(struct s

                struct mtd_partition    *parts = NULL;
                int                     nr_parts = 0;
  
                struct mtd_partition    *parts = NULL;
                int                     nr_parts = 0;