ARM: at91: prepare common clk transition for sam9263
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Thu, 10 Apr 2014 18:19:05 +0000 (20:19 +0200)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Wed, 9 Jul 2014 17:05:21 +0000 (19:05 +0200)
Enclose the sam9263 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
 #endif"

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/mach-at91/at91sam9263.c

index f302905..c074653 100644 (file)
 #include "at91_rstc.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
  * -------------------------------------------------------------------- */
@@ -280,6 +281,9 @@ static void __init at91sam9263_register_clocks(void)
        clk_register(&pck2);
        clk_register(&pck3);
 }
+#else
+#define at91sam9263_register_clocks NULL
+#endif
 
 /* --------------------------------------------------------------------
  *  GPIO