[kernel] backport two changes from kernel.org:

[openwrt.git] / target / linux / ar71xx / patches-2.6.32 / 109-mtd-wrt160nl-trx-parser.patch

diff --git a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
index 7af8843..558f047 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
+++ b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c

-@@ -886,6 +886,16 @@ static int __devinit m25p_probe(struct s
+@@ -891,6 +891,16 @@ static int __devinit m25p_probe(struct s

                                        part_probes, &parts, 0);
                }
  #endif
                                        part_probes, &parts, 0);
                }
  #endif