[PATCHv2 27/32] ARM: at91: prepare common clk transition for sam9263
Enclose the sam9263 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91) #endif" Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/at91sam9263.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index f30290572293..c07465361947 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -25,10 +25,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 * */ @@ -280,6 +281,9 @@ static void __init at91sam9263_register_clocks(void) clk_register(); clk_register(); } +#else +#define at91sam9263_register_clocks NULL +#endif /* * GPIO -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCHv2 27/32] ARM: at91: prepare common clk transition for sam9263
Enclose the sam9263 old clk registration in #if defined(CONFIG_OLD_CLK_AT91) #endif Signed-off-by: Alexandre Belloni alexandre.bell...@free-electrons.com --- arch/arm/mach-at91/at91sam9263.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index f30290572293..c07465361947 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -25,10 +25,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 * */ @@ -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 -- 1.9.1 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
