On 14/04/2014 at 10:43:11 +0200, Boris Brezillon wrote : > This patch encloses sam9x5 old clk registration in > "#if defined(CONFIG_OLD_CLK_AT91) #endif" sections. > > Signed-off-by: Boris BREZILLON <boris.brezillon@xxxxxxxxxxxxxxxxxx> Acked-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx> > --- > arch/arm/mach-at91/at91sam9x5.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c > index 9ad781d..e994edd 100644 > --- a/arch/arm/mach-at91/at91sam9x5.c > +++ b/arch/arm/mach-at91/at91sam9x5.c > @@ -19,9 +19,10 @@ > #include "board.h" > #include "soc.h" > #include "generic.h" > -#include "clock.h" > #include "sam9_smc.h" > > +#if defined(CONFIG_OLD_CLK_AT91) > +#include "clock.h" > /* -------------------------------------------------------------------- > * Clocks > * -------------------------------------------------------------------- */ > @@ -313,6 +314,7 @@ static void __init at91sam9x5_register_clocks(void) > clk_register(&pck0); > clk_register(&pck1); > } > +#endif > > /* -------------------------------------------------------------------- > * AT91SAM9x5 processor initialization > @@ -334,6 +336,8 @@ static void __init at91sam9x5_initialize(void) > > AT91_SOC_START(at91sam9x5) > .map_io = at91sam9x5_map_io, > +#if defined(CONFIG_OLD_CLK_AT91) > .register_clocks = at91sam9x5_register_clocks, > +#endif > .init = at91sam9x5_initialize, > AT91_SOC_END > -- > 1.8.3.2 > -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
