diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-04-10 20:18:19 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-07-09 19:05:11 +0200 |
| commit | 36c203f1cac7b1ea8131b07a7839b79918ad3bae (patch) | |
| tree | 83ed67cca15f4ff3b908e9d9fb29d7526386681a /arch/arm/mach-at91/at91rm9200.c | |
| parent | 152f3003f055465b16e16ee98de3c2080814bd97 (diff) | |
| download | op-kernel-dev-36c203f1cac7b1ea8131b07a7839b79918ad3bae.zip op-kernel-dev-36c203f1cac7b1ea8131b07a7839b79918ad3bae.tar.gz | |
ARM: at91: prepare common clk transition for rm9200
Enclose the rm9200 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
#endif"
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200.c')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 787bb50..038702e 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 |
