diff options
author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
commit | 02629d8f87303a03e3ac36f48c508242d9b8cb09 (patch) | |
tree | 250a83e0d0e2cf5c7fe49e0a2087f3739f4509c2 /target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch | |
parent | 7be0ed78e7cf578aa89996d408703ea2ab79a1e8 (diff) | |
download | upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.gz upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.bz2 upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.zip |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42463
Diffstat (limited to 'target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch')
-rw-r--r-- | target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch b/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch index 763a2455c5..e2e313ca65 100644 --- a/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch +++ b/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch @@ -11,11 +11,9 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/mtd/nand/qcom_adm_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/mtd/nand/qcom_adm_dma.c b/drivers/mtd/nand/qcom_adm_dma.c -index 46d8473..542f901 100644 --- a/drivers/mtd/nand/qcom_adm_dma.c +++ b/drivers/mtd/nand/qcom_adm_dma.c -@@ -568,14 +568,14 @@ static int msm_dmov_init_clocks(struct platform_device *pdev) +@@ -568,14 +568,14 @@ static int msm_dmov_init_clocks(struct p int adm = (pdev->id >= 0) ? pdev->id : 0; int ret; @@ -32,7 +30,7 @@ index 46d8473..542f901 100644 if (IS_ERR(dmov_conf[adm].pclk)) { dmov_conf[adm].pclk = NULL; /* pclk not present on all SoCs, don't bail on failure */ -@@ -690,7 +690,7 @@ static int msm_dmov_probe(struct platform_device *pdev) +@@ -690,7 +690,7 @@ static int msm_dmov_probe(struct platfor } /* get resets */ @@ -41,6 +39,3 @@ index 46d8473..542f901 100644 if (IS_ERR(dmov_conf[adm].adm_reset)) { dev_err(&pdev->dev, "failed to get adm reset\n"); ret = PTR_ERR(dmov_conf[adm].adm_reset); --- -1.7.10.4 - |