aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-14 17:21:47 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-14 17:21:47 +0000
commit1b39ce11a8b847a5291b19d6a13c782d11c5ec95 (patch)
tree459142566be8fadabae7f46844be0f3dbc3f7bd8 /target/linux
parent558f9342d5c27c7cd959817cd565251036069b5d (diff)
downloadupstream-1b39ce11a8b847a5291b19d6a13c782d11c5ec95.tar.gz
upstream-1b39ce11a8b847a5291b19d6a13c782d11c5ec95.tar.bz2
upstream-1b39ce11a8b847a5291b19d6a13c782d11c5ec95.zip
also fix invalid hunks in 2.6.33 patch
SVN-Revision: 20209
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch8
1 files changed, 0 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
index 4adad9a02e..3a47c85bb9 100644
--- a/target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/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: