diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-04-10 14:19:33 -0400 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-07-09 13:05:18 -0400 |
commit | 003b45e287faa6304f4d77a3c456e0c024563a51 (patch) | |
tree | 091f5f7575251f20bc9d728d1b52f3f4f6cb8a89 /arch/arm/mach-at91 | |
parent | d738989f08d8fe4934bd46920d183802ebf1544e (diff) |
ARM: at91: prepare common clk transition for sam9g45
Enclose the sam9g45 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>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 9d3d544ac19c..0d5d85797cd6 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
@@ -25,10 +25,11 @@ | |||
25 | #include "at91_aic.h" | 25 | #include "at91_aic.h" |
26 | #include "soc.h" | 26 | #include "soc.h" |
27 | #include "generic.h" | 27 | #include "generic.h" |
28 | #include "clock.h" | ||
29 | #include "sam9_smc.h" | 28 | #include "sam9_smc.h" |
30 | #include "pm.h" | 29 | #include "pm.h" |
31 | 30 | ||
31 | #if defined(CONFIG_OLD_CLK_AT91) | ||
32 | #include "clock.h" | ||
32 | /* -------------------------------------------------------------------- | 33 | /* -------------------------------------------------------------------- |
33 | * Clocks | 34 | * Clocks |
34 | * -------------------------------------------------------------------- */ | 35 | * -------------------------------------------------------------------- */ |
@@ -331,6 +332,9 @@ static void __init at91sam9g45_register_clocks(void) | |||
331 | clk_register(&pck0); | 332 | clk_register(&pck0); |
332 | clk_register(&pck1); | 333 | clk_register(&pck1); |
333 | } | 334 | } |
335 | #else | ||
336 | #define at91sam9g45_register_clocks NULL | ||
337 | #endif | ||
334 | 338 | ||
335 | /* -------------------------------------------------------------------- | 339 | /* -------------------------------------------------------------------- |
336 | * GPIO | 340 | * GPIO |