summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches/065-block2mtd_init.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-05-26 19:41:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-05-26 19:41:42 +0000
commit94c0d84182f1ca41f280b43d4f52fe6346153c48 (patch)
tree324b8afd607b0c63c5746d58b66ce75647153e8d /target/linux/generic-2.6/patches/065-block2mtd_init.patch
parentd4cce8a452b1f1457b19b356245d1b91eb3357e8 (diff)
downloadmaster-31e0f0ae-94c0d84182f1ca41f280b43d4f52fe6346153c48.tar.gz
master-31e0f0ae-94c0d84182f1ca41f280b43d4f52fe6346153c48.tar.bz2
master-31e0f0ae-94c0d84182f1ca41f280b43d4f52fe6346153c48.zip
refresh kernel patches so that they apply cleanly
SVN-Revision: 7347
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 ef483bedd1..57a8615a02 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 */