aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-12-11 11:40:05 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-12-11 11:40:05 +0000
commit0046f507ab664a8e17811bcb65d3b866661efa14 (patch)
tree42e1e51b37bad230b9b95ad4a5b97f34a5a2d64d /target/linux/x86
parent5696a226d6a5f0eee95d9108cba983ae9d8d37f9 (diff)
downloadupstream-0046f507ab664a8e17811bcb65d3b866661efa14.tar.gz
upstream-0046f507ab664a8e17811bcb65d3b866661efa14.tar.bz2
upstream-0046f507ab664a8e17811bcb65d3b866661efa14.zip
refresh patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18748 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/patches-2.6.31/300-block2mtd_init.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/x86/patches-2.6.31/300-block2mtd_init.patch b/target/linux/x86/patches-2.6.31/300-block2mtd_init.patch
index 123a9d305a..649bee33a2 100644
--- a/target/linux/x86/patches-2.6.31/300-block2mtd_init.patch
+++ b/target/linux/x86/patches-2.6.31/300-block2mtd_init.patch
@@ -151,7 +151,7 @@
static int kernel_init(void *);
-@@ -784,12 +785,13 @@ int do_one_initcall(initcall_t fn)
+@@ -779,12 +780,13 @@ int do_one_initcall(initcall_t fn)
extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
@@ -167,7 +167,7 @@
do_one_initcall(*call);
/* Make sure there is no pending stuff from the initcall sequence */
-@@ -812,7 +814,7 @@ static void __init do_basic_setup(void)
+@@ -807,7 +809,7 @@ static void __init do_basic_setup(void)
driver_init();
init_irq_proc();
do_ctors();
@@ -176,7 +176,7 @@
}
static void __init do_pre_smp_initcalls(void)
-@@ -873,6 +875,13 @@ static noinline int init_post(void)
+@@ -868,6 +870,13 @@ static noinline int init_post(void)
panic("No init found. Try passing init= option to kernel.");
}
@@ -190,7 +190,7 @@
static int __init kernel_init(void * unused)
{
lock_kernel();
-@@ -917,7 +926,16 @@ static int __init kernel_init(void * unu
+@@ -912,7 +921,16 @@ static int __init kernel_init(void * unu
if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
ramdisk_execute_command = NULL;