From mboxrd@z Thu Jan 1 00:00:00 1970 From: alexandre.belloni@free-electrons.com (Alexandre Belloni) Date: Tue, 1 Jul 2014 16:12:17 +0200 Subject: [PATCH 08/33] ARM: at91: prepare common clk transition for sam9260 In-Reply-To: <1404223962-30471-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1404223962-30471-1-git-send-email-alexandre.belloni@free-electrons.com> Message-ID: <1404223962-30471-9-git-send-email-alexandre.belloni@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Enclose the sam9260 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91) #endif" Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/at91sam9260.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index c3d22be73b7c..3477ba94c4c5 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -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 -- 1.9.1