[PATCH 04/33] ARM: at91: prepare common clk transition for rm9200

Boris BREZILLON
2014-07-02T08:20:23Z

On Tue, 1 Jul 2014 16:12:13 +0200
Alexandre Belloni <alexandre.belloni@free-electrons.com> wrote:

> Enclose the rm9200 old clk registration in "#if
> defined(CONFIG_OLD_CLK_AT91) #endif"
>

Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>

> Signed-off-by: Alexandre Belloni
> <alexandre.belloni@free-electrons.com> ---
> 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