summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-15 19:30:21 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-15 19:30:21 +0000
commitae2566d99ca3e1cd82660434ba5078eaa9ec2cd9 (patch)
treeeaa83c336bf1e8a4942376277bb17dab04a0630e /target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
parentdb0c81f577b96bbbb03dfc1d33db1ea025d1c4b1 (diff)
[kernel] refresh patches against 2.6.27 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
index 4483e7788..50df4aae0 100644
--- a/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
@@ -8,7 +8,7 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
-@@ -232,10 +233,11 @@
+@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
/* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -21,7 +21,7 @@
char *name;
if (!devname)
-@@ -273,17 +275,17 @@
+@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
mutex_init(&dev->write_mutex);
@@ -45,7 +45,7 @@
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@
+@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -66,7 +66,7 @@
return dev;
devinit_err:
-@@ -376,9 +381,9 @@
+@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
@@ -78,7 +78,7 @@
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
-@@ -389,7 +394,7 @@
+@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
@@ -87,7 +87,7 @@
token[i] = strsep(&str, ",");
if (str)
-@@ -408,8 +413,10 @@
+@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
@@ -99,7 +99,7 @@
return 0;
}
-@@ -443,7 +450,7 @@
+@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);