aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-08 19:11:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-08 19:11:53 +0000
commit5d67fbe1b7c3aa6e64c9c694aef1e0769072e973 (patch)
treeec1c8bf5e7f64f9f25f42356462dd8d23dc141f5 /target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
parent2b2541ebad985e416bd9a95e4fb8ccad1407570b (diff)
downloadupstream-5d67fbe1b7c3aa6e64c9c694aef1e0769072e973.tar.gz
upstream-5d67fbe1b7c3aa6e64c9c694aef1e0769072e973.tar.bz2
upstream-5d67fbe1b7c3aa6e64c9c694aef1e0769072e973.zip
generic-2.6/2.6.23: refresh patches
SVN-Revision: 14448
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
index e92499faf0..fff857fdf1 100644
--- a/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/060-block2mtd_init.patch
@@ -8,7 +8,7 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
-@@ -237,10 +238,11 @@
+@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
/* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -21,7 +21,7 @@
if (!devname)
return NULL;
-@@ -279,14 +281,18 @@
+@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -45,7 +45,7 @@
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
-@@ -298,15 +304,18 @@
+@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -68,7 +68,7 @@
return dev;
devinit_err:
-@@ -379,9 +388,9 @@
+@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
@@ -80,7 +80,7 @@
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
-@@ -392,7 +401,7 @@
+@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
@@ -89,7 +89,7 @@
token[i] = strsep(&str, ",");
if (str)
-@@ -412,8 +421,10 @@
+@@ -412,8 +421,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
@@ -101,7 +101,7 @@
return 0;
}
-@@ -447,7 +458,7 @@
+@@ -447,7 +458,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);