From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Mar 2010 17:20:40 +0000 (+0000)
Subject: [kernel] fix invalid hunks in 060-block2mtd_init.patch file
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=6b4ad6d71877c7c6fb7fd4185b699738fc28c30d

[kernel] fix invalid hunks in 060-block2mtd_init.patch file

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20207 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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 4adad9a02..3a47c85bb 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: