On 14/04/2014 at 10:16:36 +0200, Boris Brezillon wrote : > This patch encloses sam9n12 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/at91sam9n12.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c > index f2ea7b0..c8988fe 100644 > --- a/arch/arm/mach-at91/at91sam9n12.c > +++ b/arch/arm/mach-at91/at91sam9n12.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 > * -------------------------------------------------------------------- */ > @@ -215,6 +216,9 @@ static void __init at91sam9n12_register_clocks(void) > ARRAY_SIZE(periph_clocks_lookups)); > > } > +#else > +#define at91sam9n12_register_clocks NULL > +#endif > > /* -------------------------------------------------------------------- > * AT91SAM9N12 processor initialization > -- > 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
