diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
| commit | 9157f620436a8383b13c30c0a26ad06b976b1a0b (patch) | |
| tree | 768c585c31df15ffc89cd03480ce4558ea291ca0 /target/linux/octeon/patches-3.18/160-cmdline-hack.patch | |
| parent | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (diff) | |
| download | upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.gz upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.bz2 upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.zip | |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45711 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/octeon/patches-3.18/160-cmdline-hack.patch')
| -rw-r--r-- | target/linux/octeon/patches-3.18/160-cmdline-hack.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/octeon/patches-3.18/160-cmdline-hack.patch b/target/linux/octeon/patches-3.18/160-cmdline-hack.patch index 39b8a99ae5..8ef73a12b2 100644 --- a/target/linux/octeon/patches-3.18/160-cmdline-hack.patch +++ b/target/linux/octeon/patches-3.18/160-cmdline-hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c -@@ -609,6 +609,35 @@ +@@ -609,6 +609,35 @@ void octeon_user_io_init(void) write_c0_derraddr1(0); } @@ -36,7 +36,7 @@ /** * Early entry point for arch setup */ -@@ -798,6 +827,8 @@ +@@ -798,6 +827,8 @@ void __init prom_init(void) } } |