summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches/065-block2mtd_init.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-26 19:41:42 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-26 19:41:42 +0000
commita3df50fd61e049a5827878459d7bf0b9e670f2ba (patch)
treeb2ebe5f370ac75b461e97fff8677e2fd9373756f /target/linux/generic-2.6/patches/065-block2mtd_init.patch
parent62866afbacccec283c7aaed648825fb27272ac3f (diff)
refresh kernel patches so that they apply cleanly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7347 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches/065-block2mtd_init.patch')
-rw-r--r--target/linux/generic-2.6/patches/065-block2mtd_init.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches/065-block2mtd_init.patch b/target/linux/generic-2.6/patches/065-block2mtd_init.patch
index ef483bedd..57a8615a0 100644
--- a/target/linux/generic-2.6/patches/065-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches/065-block2mtd_init.patch
@@ -1,5 +1,6 @@
---- linux.old/drivers/mtd/devices/block2mtd.c 2007-03-02 01:00:13.866987272 +0100
-+++ linux.dev/drivers/mtd/devices/block2mtd.c 2007-03-02 02:03:45.558522080 +0100
+diff -urN linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c
+--- linux-2.6.21.1.old/drivers/mtd/devices/block2mtd.c 2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/mtd/devices/block2mtd.c 2007-05-26 20:06:13.547923960 +0200
@@ -16,6 +16,7 @@
#include <linux/list.h>
#include <linux/init.h>
@@ -8,7 +9,7 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
-@@ -287,10 +288,11 @@
+@@ -288,10 +289,11 @@
/* FIXME: ensure that mtd->size % erase_size == 0 */