aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-02-23 10:59:40 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-02-23 10:59:40 +0000
commitf677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb (patch)
treea4971798ff33bb5e653297f14906628b84407790 /target/linux/ar7
parent6c8300df3d593abd911a3d6bb1a95eee4cfd06f8 (diff)
downloadupstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.tar.gz
upstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.tar.bz2
upstream-f677b1bc7e37642eb1c42d3068ff3c44eb5ed3cb.zip
kernel: update 3.10 to 3.10.32
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 39707
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/Makefile2
-rw-r--r--target/linux/ar7/patches-3.10/500-serial_kludge.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index e28213b88d..4b482dec74 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs atm
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
SUBTARGETS:=generic ac49x
-LINUX_VERSION:=3.10.28
+LINUX_VERSION:=3.10.32
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ar7/patches-3.10/500-serial_kludge.patch b/target/linux/ar7/patches-3.10/500-serial_kludge.patch
index bb341c67c4..e686b765ac 100644
--- a/target/linux/ar7/patches-3.10/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-3.10/500-serial_kludge.patch
@@ -14,7 +14,7 @@
};
/* Uart divisor latch read */
-@@ -2839,7 +2846,11 @@ static void serial8250_console_putchar(s
+@@ -2843,7 +2850,11 @@ static void serial8250_console_putchar(s
struct uart_8250_port *up =
container_of(port, struct uart_8250_port, port);