aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-14 17:20:40 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-14 17:20:40 +0000
commit2e94e94a091bd4088ee350d868ac58ee426fdde0 (patch)
treefb7863061dfb83516721c7099c7004158db294c4
parent16603d025c0644cc28278e1acba0683af944891c (diff)
downloadupstream-2e94e94a091bd4088ee350d868ac58ee426fdde0.tar.gz
upstream-2e94e94a091bd4088ee350d868ac58ee426fdde0.tar.bz2
upstream-2e94e94a091bd4088ee350d868ac58ee426fdde0.zip
fix invalid hunks in 060-block2mtd_init.patch file
SVN-Revision: 20207
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/060-block2mtd_init.patch8
1 files changed, 0 insertions, 8 deletions
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: