On Tue, 1 Jul 2014 16:12:13 +0200 Alexandre Belloni <[email protected]> wrote:
> Enclose the rm9200 old clk registration in "#if > defined(CONFIG_OLD_CLK_AT91) #endif" > Acked-by: Boris BREZILLON <[email protected]> > Signed-off-by: Alexandre Belloni > <[email protected]> --- > arch/arm/mach-at91/at91rm9200.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-at91/at91rm9200.c > b/arch/arm/mach-at91/at91rm9200.c index 787bb50a4dff..038702ee8bc6 > 100644 --- a/arch/arm/mach-at91/at91rm9200.c > +++ b/arch/arm/mach-at91/at91rm9200.c > @@ -26,10 +26,11 @@ > #include "at91_aic.h" > #include "soc.h" > #include "generic.h" > -#include "clock.h" > #include "sam9_smc.h" > #include "pm.h" > > +#if defined(CONFIG_OLD_CLK_AT91) > +#include "clock.h" > /* > -------------------------------------------------------------------- > * Clocks > * > -------------------------------------------------------------------- > */ @@ -277,6 +278,9 @@ static void __init > at91rm9200_register_clocks(void) clk_register(&pck2); > clk_register(&pck3); } > +#else > +#define at91rm9200_register_clocks NULL > +#endif > > /* > -------------------------------------------------------------------- > * GPIO -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
