From 76d079204df113afa9e382a43abb5e1a2135150d Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 May 2015 19:32:46 +0000 Subject: 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 SVN-Revision: 45711 --- .../gemini/patches-3.18/121-arm-gemini-register-ethernet.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'target/linux/gemini/patches-3.18/121-arm-gemini-register-ethernet.patch') 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 @@ -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(); -- cgit v1.2.3