summaryrefslogtreecommitdiff
path: root/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-12 17:49:01 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-12 17:49:01 +0000
commit88cda758c321f0b56556d425daca5c59066eb31a (patch)
tree49f8dc36553952cfaba9a6d83236d549db7191d7 /target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch
parent9d0f42d50ad05f35801ff2c2bc9f05ecc7eb4b9b (diff)
downloadmtk-20170518-88cda758c321f0b56556d425daca5c59066eb31a.zip
mtk-20170518-88cda758c321f0b56556d425daca5c59066eb31a.tar.gz
mtk-20170518-88cda758c321f0b56556d425daca5c59066eb31a.tar.bz2
update to 2.6.25.20, 2.6.26.8, 2.6.27.5 and refresh patches * based on a patch by Hauke Mehrtens * closes #4193
SVN-Revision: 13192
Diffstat (limited to 'target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch')
-rw-r--r--target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch b/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch
index dc7f7df..e16570f 100644
--- a/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch
+++ b/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch
@@ -69,7 +69,7 @@
static struct page *page_read(struct address_space *mapping, int index)
{
-@@ -510,7 +542,9 @@ static int block2mtd_setup2(const char *val)
+@@ -510,7 +542,9 @@ static int block2mtd_setup2(const char *
if (token[2] && (strlen(token[2]) + 1 > 80))
parse_err("mtd device name too long");
@@ -100,7 +100,7 @@
VMLINUX_SYMBOL(__per_cpu_start) = .; \
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -174,16 +174,8 @@ static int __init fs_names_setup(char *str)
+@@ -174,16 +174,8 @@ static int __init fs_names_setup(char *s
return 1;
}
@@ -185,7 +185,7 @@
static int __init kernel_init(void * unused)
{
lock_kernel();
-@@ -873,7 +882,16 @@ static int __init kernel_init(void * unused)
+@@ -873,7 +882,16 @@ static int __init kernel_init(void * unu
if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
ramdisk_execute_command = NULL;