aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
commit74215746b332d79139e92650a4240c97e3a88845 (patch)
treec4c9b4bf8791e93a1d21aad5b904bb17a814c726 /target/linux/generic-2.6/patches-2.6.24/060-block2mtd_init.patch
parent2259476f060ea4b9ca9cffa82ad052a690606fab (diff)
downloadupstream-74215746b332d79139e92650a4240c97e3a88845.tar.gz
upstream-74215746b332d79139e92650a4240c97e3a88845.tar.bz2
upstream-74215746b332d79139e92650a4240c97e3a88845.zip
refresh generic 2.6.24 patches to match upstream style
SVN-Revision: 11302
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.patch20
1 files changed, 9 insertions, 11 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 80ff918f71..4a1c9581f5 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,5 @@
-Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/devices/block2mtd.c
-+++ linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
+--- a/drivers/mtd/devices/block2mtd.c
++++ b/drivers/mtd/devices/block2mtd.c
@@ -16,6 +16,7 @@
#include <linux/list.h>
#include <linux/init.h>
@@ -10,7 +8,7 @@ Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
-@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
+@@ -237,10 +238,11 @@
/* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -23,7 +21,7 @@ Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
if (!devname)
return NULL;
-@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
+@@ -279,14 +281,18 @@
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -47,7 +45,7 @@ Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
-@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
+@@ -298,15 +304,18 @@
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -70,7 +68,7 @@ Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
return dev;
devinit_err:
-@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
+@@ -379,9 +388,9 @@
static int block2mtd_setup2(const char *val)
{
@@ -82,7 +80,7 @@ Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
-@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
+@@ -392,7 +401,7 @@
strcpy(str, val);
kill_final_newline(str);
@@ -91,7 +89,7 @@ Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
token[i] = strsep(&str, ",");
if (str)
-@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *
+@@ -411,8 +420,10 @@
parse_err("illegal erase size");
}
}
@@ -103,7 +101,7 @@ Index: linux-2.6.24.7/drivers/mtd/devices/block2mtd.c
return 0;
}
-@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v
+@@ -446,7 +457,7 @@
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);