diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-11-07 08:44:56 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-11-07 08:44:56 +0000 |
| commit | d35bad03e31bd861e231c8c68799c62752b56fa8 (patch) | |
| tree | e4dff5e623cd35ac5d02b823ba3aeb517e490275 /target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch | |
| parent | a1bf28950d16ca97897a524dc74ec0e52ef08fff (diff) | |
| download | master-31e0f0ae-d35bad03e31bd861e231c8c68799c62752b56fa8.tar.gz master-31e0f0ae-d35bad03e31bd861e231c8c68799c62752b56fa8.tar.bz2 master-31e0f0ae-d35bad03e31bd861e231c8c68799c62752b56fa8.zip | |
update to 2.6.25.19, and refresh patches
SVN-Revision: 13137
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch index 4a1c9581f5..f5d9b0ca8a 100644 --- a/target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch +++ b/target/linux/generic-2.6/patches-2.6.25/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) -@@ -411,8 +420,10 @@ +@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char * parse_err("illegal erase size"); } } @@ -101,7 +101,7 @@ return 0; } -@@ -446,7 +457,7 @@ +@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200); |