diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:25:45 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-18 20:25:45 +0000 |
| commit | e582f614b6e15517a9207b0a96a72b68f7a254df (patch) | |
| tree | a5424c2b64deca27b19672364f80d83e46892d23 /target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch | |
| parent | 37044cf01e5764164d34a4bfe14f9f00f7a2f6ea (diff) | |
| download | upstream-e582f614b6e15517a9207b0a96a72b68f7a254df.tar.gz upstream-e582f614b6e15517a9207b0a96a72b68f7a254df.tar.bz2 upstream-e582f614b6e15517a9207b0a96a72b68f7a254df.zip | |
refresh generic 2.6.24 patches
SVN-Revision: 11188
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch index b331f7361b..80ff918f71 100644 --- a/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch +++ b/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c +Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c =================================================================== ---- linux-2.6.23-rc6.orig/drivers/mtd/devices/block2mtd.c 2007-09-21 16:23:54.000000000 +0800 -+++ linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c 2007-09-21 16:23:59.000000000 +0800 +--- linux-2.6.24.7.orig/drivers/mtd/devices/block2mtd.c ++++ linux-2.6.24.7/drivers/mtd/devices/block2mtd.c @@ -16,6 +16,7 @@ #include <linux/list.h> #include <linux/init.h> @@ -10,7 +10,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c #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 */ @@ -23,7 +23,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c 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 */ @@ -47,7 +47,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c 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; @@ -70,7 +70,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c 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) { @@ -82,7 +82,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c 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); @@ -91,7 +91,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c token[i] = strsep(&str, ","); if (str) -@@ -412,8 +421,10 @@ +@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char * parse_err("illegal erase size"); } } @@ -103,7 +103,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/devices/block2mtd.c return 0; } -@@ -447,7 +458,7 @@ +@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); |