kernel: update 3.10 to 3.10.34

[openwrt/staging/mkresin.git] / target / linux / imx6 / patches-3.10 / 0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch

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 5553101cc1684b62b9598697367c2a6f00f82331..fd901308260c34f4e9d89f7fc0430383330bd395 100644 (file)
--- 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;
                }