| From 59e9bea3189d254819f4d4d91df56f202ee5c9a1 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 16 Apr 2013 17:16:20 +0200 |
| Subject: ARM: shmobile: r8a7790: Make private clock arrays static |
| |
| Both clock-r8a7740.c and clock-r8a7790.c define a div4_clks array as |
| non-static. Compiling support for both SoCs thus result in a symbol |
| redefinition. Fix it by defining the arrays as static. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 72378a4ab7fc30e1ad6a5266218ccc7933d60370) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-r8a7790.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c |
| index a4810034..bedd20ca 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7790.c |
| @@ -154,7 +154,7 @@ enum { |
| DIV4_SDH, DIV4_SD0, DIV4_SD1, DIV4_NR |
| }; |
| |
| -struct clk div4_clks[DIV4_NR] = { |
| +static struct clk div4_clks[DIV4_NR] = { |
| [DIV4_SDH] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 8, 0x0dff, CLK_ENABLE_ON_INIT), |
| [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1de0, CLK_ENABLE_ON_INIT), |
| [DIV4_SD1] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 0, 0x1de0, CLK_ENABLE_ON_INIT), |
| -- |
| 1.8.4.3.gca3854a |
| |
