diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-12-11 11:40:05 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-12-11 11:40:05 +0000 |
| commit | ac40715c5f60cb334ae34cd05d96603db7e79378 (patch) | |
| tree | 923eb8a7348e645a3fef9dd34d3e434a10bb6985 /target/linux | |
| parent | 948ecb59d9d59f1c7097e22ff7da7672b2d9a5dc (diff) | |
| download | upstream-ac40715c5f60cb334ae34cd05d96603db7e79378.tar.gz upstream-ac40715c5f60cb334ae34cd05d96603db7e79378.tar.bz2 upstream-ac40715c5f60cb334ae34cd05d96603db7e79378.zip | |
refresh patch
SVN-Revision: 18748
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/x86/patches-2.6.31/300-block2mtd_init.patch | 8 |
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; |