diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-03-27 09:28:33 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-03-27 09:28:33 +0000 |
| commit | 4d85ad8010a6b66a9982c02497e0c8c381cc6624 (patch) | |
| tree | fe94818d5fcddcb5a1458d99a57c8cb909c97aa9 /target/linux/imx6 | |
| parent | 06640cbff58c3c9c2074180a6794f777b824982d (diff) | |
| download | upstream-4d85ad8010a6b66a9982c02497e0c8c381cc6624.tar.gz upstream-4d85ad8010a6b66a9982c02497e0c8c381cc6624.tar.bz2 upstream-4d85ad8010a6b66a9982c02497e0c8c381cc6624.zip | |
kernel: update 3.10 to 3.10.34
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40291 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6')
| -rw-r--r-- | target/linux/imx6/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index 688e355393..b5a7ebe3e2 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=neon MAINTAINER:=Luka Perkov <luka@openwrt.org> -LINUX_VERSION:=3.10.32 +LINUX_VERSION:=3.10.34 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch b/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch index 5553101cc1..fd90130826 100644 --- a/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch +++ b/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch @@ -19,7 +19,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c -@@ -1019,7 +1019,6 @@ static int flexcan_probe(struct platform +@@ -1021,7 +1021,6 @@ static int flexcan_probe(struct platform err = PTR_ERR(clk_ipg); goto failed_clock; } @@ -27,7 +27,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> clk_per = devm_clk_get(&pdev->dev, "per"); if (IS_ERR(clk_per)) { -@@ -1027,6 +1026,7 @@ static int flexcan_probe(struct platform +@@ -1029,6 +1028,7 @@ static int flexcan_probe(struct platform err = PTR_ERR(clk_per); goto failed_clock; } |