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/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch | |
parent | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (diff) | |
download | master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.gz master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.bz2 master-187ad058-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/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch')
-rw-r--r-- | target/linux/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch b/target/linux/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch index 8ce3de27fe..5ae896c66f 100644 --- a/target/linux/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch +++ b/target/linux/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch @@ -1,5 +1,5 @@ ---- a/arch/arm/mach-gemini/board-nas4220b.c 2011-04-21 13:19:09.878432930 +0200 -+++ b/arch/arm/mach-gemini/board-nas4220b.c 2011-04-21 13:30:37.555082365 +0200 +--- a/arch/arm/mach-gemini/board-nas4220b.c ++++ b/arch/arm/mach-gemini/board-nas4220b.c @@ -28,9 +28,27 @@ #include <mach/hardware.h> @@ -28,7 +28,7 @@ static struct gpio_led ib4220b_leds[] = { { .name = "nas4220b:orange:hdd", -@@ -87,9 +105,39 @@ +@@ -87,15 +105,47 @@ static struct platform_device ib4220b_ke }, }; @@ -68,7 +68,6 @@ platform_register_uart(); platform_register_pflash(SZ_16M, NULL, 0); platform_device_register(&ib4220b_led_device); -@@ -96,6 +144,8 @@ platform_device_register(&ib4220b_key_device); platform_register_rtc(); platform_register_watchdog(); |