aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
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
commit750a9131ce94fdd3ed8393bdb7d540b3f2c8f00f (patch)
tree014cf47547043cf59721c9cacaa93cb16fec5423 /target/linux/generic-2.6
parent8cf55514b1a9f8b082f9d7b7b0d6756987ae5879 (diff)
downloadmaster-187ad058-750a9131ce94fdd3ed8393bdb7d540b3f2c8f00f.tar.gz
master-187ad058-750a9131ce94fdd3ed8393bdb7d540b3f2c8f00f.tar.bz2
master-187ad058-750a9131ce94fdd3ed8393bdb7d540b3f2c8f00f.zip
[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
Diffstat (limited to 'target/linux/generic-2.6')
-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: