diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2014-05-12 16:26:27 (GMT) |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 16:03:15 (GMT) |
| commit | 233df5d124b00808374cca91cd7936e62086c20b (patch) | |
| tree | d802e33c4a4db2fc8f0f3f6fd17bf6fae2df8039 /arch/arm/mach-at91 | |
| parent | ed093dc0d34e1ff89054dfe32b1c155fb387e432 (diff) | |
| download | linux-233df5d124b00808374cca91cd7936e62086c20b.tar.xz | |
ARM: at91: prepare common clk transition for sam9n12 SoC
This patch encloses sam9n12 old clk registration in
"#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.
Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Tested-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9n12.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c index f2ea7b0..c8988fe 100644 --- a/arch/arm/mach-at91/at91sam9n12.c +++ b/arch/arm/mach-at91/at91sam9n12.c @@ -19,9 +19,10 @@ #include "board.h" #include "soc.h" #include "generic.h" -#include "clock.h" #include "sam9_smc.h" +#if defined(CONFIG_OLD_CLK_AT91) +#include "clock.h" /* -------------------------------------------------------------------- * Clocks * -------------------------------------------------------------------- */ @@ -215,6 +216,9 @@ static void __init at91sam9n12_register_clocks(void) ARRAY_SIZE(periph_clocks_lookups)); } +#else +#define at91sam9n12_register_clocks NULL +#endif /* -------------------------------------------------------------------- * AT91SAM9N12 processor initialization |