ARM: at91: prepare common clk transition for sam9260 (57b37ed5) · Commits · 戴 / test

Enclose the sam9260 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91) #endif" Signed-off-by:

arch/arm/mach-at91/at91sam9260.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -27,10 +27,11 @@
		#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
		* -------------------------------------------------------------------- */
		@@ -288,6 +289,9 @@ static void __init at91sam9260_register_clocks(void)
		clk_register(&pck0);
		clk_register(&pck1);
		}
		#else
		#define at91sam9260_register_clocks NULL
		#endif

		/* --------------------------------------------------------------------
		* GPIO