aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-03-15 14:39:51 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-03-15 14:39:51 +0000
commit84da5668735a12ef1a36eeb6777c37cd0de63ef9 (patch)
tree8417e7b50ec23e10ee0678ad5b4f032260cc6b2a /target/linux/cns3xxx
parent257aff3780d895c15f710ee10edeeb9c04e97ed1 (diff)
downloadupstream-84da5668735a12ef1a36eeb6777c37cd0de63ef9.tar.gz
upstream-84da5668735a12ef1a36eeb6777c37cd0de63ef9.tar.bz2
upstream-84da5668735a12ef1a36eeb6777c37cd0de63ef9.zip
kernel: update linux 3.8 to 3.8.3
Also refresh the related generic/platform patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36039 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/Makefile2
-rw-r--r--target/linux/cns3xxx/patches-3.8/090-timers.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile
index aeca8f6789..f094c70e45 100644
--- a/target/linux/cns3xxx/Makefile
+++ b/target/linux/cns3xxx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs fpu gpio pcie usb usbgadget
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.8.2
+LINUX_VERSION:=3.8.3
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/cns3xxx/patches-3.8/090-timers.patch b/target/linux/cns3xxx/patches-3.8/090-timers.patch
index 488539f727..1750e80a93 100644
--- a/target/linux/cns3xxx/patches-3.8/090-timers.patch
+++ b/target/linux/cns3xxx/patches-3.8/090-timers.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -122,12 +122,13 @@ static void cns3xxx_timer_set_mode(enum
+@@ -122,12 +122,13 @@ static void cns3xxx_timer_set_mode(enum
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC: