This fixes compile error if one of SPEAr3xx implementations is not selected.
CC drivers/clk/spear/spear3xx_clock.o
drivers/clk/spear/spear3xx_clock.c: In function 'spear3xx_clk_init':
drivers/clk/spear/spear3xx_clock.c:599:3: error: implicit declaration of function 'spear300_clk_init' [-Werror=implicit-function-declaration]
drivers/clk/spear/spear3xx_clock.c:601:3: error: implicit declaration of function 'spear310_clk_init' [-Werror=implicit-function-declaration]
drivers/clk/spear/spear3xx_clock.c:603:3: error: implicit declaration of function 'spear320_clk_init' [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[3]: *** [drivers/clk/spear/spear3xx_clock.o] Error 1
make[2]: *** [drivers/clk/spear] Error 2
make[1]: *** [drivers/clk] Error 2
make: *** [drivers] Error 2
Signed-off-by: Axel Lin <[email protected]>
---
drivers/clk/spear/spear3xx_clock.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/clk/spear/spear3xx_clock.c b/drivers/clk/spear/spear3xx_clock.c
index c315745..59049cf 100644
--- a/drivers/clk/spear/spear3xx_clock.c
+++ b/drivers/clk/spear/spear3xx_clock.c
@@ -157,6 +157,8 @@ static void __init spear300_clk_init(void)
1);
clk_register_clkdev(clk, NULL, "a0000000.kbd");
}
+#else
+static inline void spear300_clk_init(void) { }
#endif
/* array of all spear 310 clock lookups */
@@ -197,6 +199,8 @@ static void __init spear310_clk_init(void)
1);
clk_register_clkdev(clk, NULL, "b2200000.serial");
}
+#else
+static inline void spear310_clk_init(void) { }
#endif
/* array of all spear 320 clock lookups */
@@ -336,6 +340,8 @@ static void __init spear320_clk_init(void)
&_lock);
clk_register_clkdev(clk, NULL, "60100000.serial");
}
+#else
+static inline void spear320_clk_init(void) { }
#endif
void __init spear3xx_clk_init(void)
--
1.7.9.5
On Tue, Nov 6, 2012 at 8:04 AM, Axel Lin <[email protected]> wrote:
> This fixes compile error if one of SPEAr3xx implementations is not selected.
>
> CC drivers/clk/spear/spear3xx_clock.o
> drivers/clk/spear/spear3xx_clock.c: In function 'spear3xx_clk_init':
> drivers/clk/spear/spear3xx_clock.c:599:3: error: implicit declaration of function 'spear300_clk_init' [-Werror=implicit-function-declaration]
> drivers/clk/spear/spear3xx_clock.c:601:3: error: implicit declaration of function 'spear310_clk_init' [-Werror=implicit-function-declaration]
> drivers/clk/spear/spear3xx_clock.c:603:3: error: implicit declaration of function 'spear320_clk_init' [-Werror=implicit-function-declaration]
> cc1: some warnings being treated as errors
> make[3]: *** [drivers/clk/spear/spear3xx_clock.o] Error 1
> make[2]: *** [drivers/clk/spear] Error 2
> make[1]: *** [drivers/clk] Error 2
> make: *** [drivers] Error 2
>
> Signed-off-by: Axel Lin <[email protected]>
Thanks..
Acked-by: Viresh Kumar <[email protected]>
Quoting viresh kumar (2012-11-05 19:36:18)
> On Tue, Nov 6, 2012 at 8:04 AM, Axel Lin <[email protected]> wrote:
> > This fixes compile error if one of SPEAr3xx implementations is not selected.
> >
> > CC drivers/clk/spear/spear3xx_clock.o
> > drivers/clk/spear/spear3xx_clock.c: In function 'spear3xx_clk_init':
> > drivers/clk/spear/spear3xx_clock.c:599:3: error: implicit declaration of function 'spear300_clk_init' [-Werror=implicit-function-declaration]
> > drivers/clk/spear/spear3xx_clock.c:601:3: error: implicit declaration of function 'spear310_clk_init' [-Werror=implicit-function-declaration]
> > drivers/clk/spear/spear3xx_clock.c:603:3: error: implicit declaration of function 'spear320_clk_init' [-Werror=implicit-function-declaration]
> > cc1: some warnings being treated as errors
> > make[3]: *** [drivers/clk/spear/spear3xx_clock.o] Error 1
> > make[2]: *** [drivers/clk/spear] Error 2
> > make[1]: *** [drivers/clk] Error 2
> > make: *** [drivers] Error 2
> >
> > Signed-off-by: Axel Lin <[email protected]>
>
> Thanks..
> Acked-by: Viresh Kumar <[email protected]>
Taken into clk-next.
Thanks,
Mike