From: Laurent Pinchart Date: Tue, 16 Apr 2013 15:16:20 +0000 (+0200) Subject: ARM: shmobile: r8a7790: Make private clock arrays static X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72378a4ab7fc30e1ad6a5266218ccc7933d60370;p=linux-beck.git 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 Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c index a48100345275..bedd20ca3987 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),