summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-14 17:21:47 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-14 17:21:47 +0000
commite8f6f13bcf144ebb4ec27b34004800751a15dec8 (patch)
tree79389216fb069191b0320b244b13bd79023d7fe8
parent30932c53d353db00425fe1e61d5456bff4a6ed05 (diff)
[kernel] also fix invalid hunks in 2.6.33 patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20209 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 4adad9a02..3a47c85bb 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: