aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-09-02 10:18:15 +0000
committerJonas Gorski <jogo@openwrt.org>2015-09-02 10:18:15 +0000
commitab4313abae4004671999a4d70fd742fe2579a8f5 (patch)
tree8be72ceab6772503ce74b1f3ce8cc75516ede1cd /target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
parent4a7ab8448f65d17f59b93f5b6d4f3a4edf94d1c1 (diff)
downloadmaster-187ad058-ab4313abae4004671999a4d70fd742fe2579a8f5.tar.gz
master-187ad058-ab4313abae4004671999a4d70fd742fe2579a8f5.tar.bz2
master-187ad058-ab4313abae4004671999a4d70fd742fe2579a8f5.zip
kernel: update 3.18 to 3.18.21
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.21 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46768 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/921-use_preinit_as_init.patch')
-rw-r--r--target/linux/generic/patches-3.18/921-use_preinit_as_init.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
index d297e3bc30..57c2fe27be 100644
--- a/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
+++ b/target/linux/generic/patches-3.18/921-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -962,7 +962,8 @@ static int __ref kernel_init(void *unuse
+@@ -963,7 +963,8 @@ static int __ref kernel_init(void *unuse
pr_err("Failed to execute %s (error %d). Attempting defaults...\n",
execute_command, ret);
}