From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 14 Mar 2010 17:20:40 +0000 (+0000)
Subject: fix invalid hunks in 060-block2mtd_init.patch file
X-Git-Tag: reboot~20655
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e94e94a091bd4088ee350d868ac58ee426fdde0;p=oweals%2Fopenwrt.git

fix invalid hunks in 060-block2mtd_init.patch file

SVN-Revision: 20207
---

diff --git a/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch
index 4adad9a02e..3a47c85bb9 100644
--- a/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch
@@ -108,14 +108,6 @@
  
  static int __init block2mtd_init(void)
  {
-diff --git a/target/linux/generic-2.6/patches-2.6.32/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.32/060-block2mtd_init.patch
-index 50df4aa..3a47c85 100644
---- a/target/linux/generic-2.6/patches-2.6.32/060-block2mtd_init.patch
-+++ b/target/linux/generic-2.6/patches-2.6.32/060-block2mtd_init.patch
-@@ -108,3 +108,13 @@
-  
-  static int __init block2mtd_init(void)
-  {
 --- a/fs/partitions/check.c
 +++ b/fs/partitions/check.c
 @@ -625,6 +625,7 @@ try_scan: