kernel: update bcma and ssb to version master-2011-07-22 from wireless-testing

[openwrt.git] / target / linux / generic / patches-2.6.36 / 060-block2mtd_init.patch

diff --git a/target/linux/generic/patches-2.6.36/060-block2mtd_init.patch b/target/linux/generic/patches-2.6.36/060-block2mtd_init.patch
index 6ff88dd..85abe7e 100644 (file)
--- a/target/linux/generic/patches-2.6.36/060-block2mtd_init.patch
+++ b/target/linux/generic/patches-2.6.36/060-block2mtd_init.patch
@@ -105,7 +105,7 @@
  {
 --- a/fs/partitions/check.c
 +++ b/fs/partitions/check.c
  {
 --- a/fs/partitions/check.c
 +++ b/fs/partitions/check.c

-@@ -677,6 +677,7 @@ rescan:
+@@ -690,6 +690,7 @@ rescan:

        kfree(state);
        return 0;
  }
        kfree(state);
        return 0;
  }