diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-04-10 20:18:47 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-07-09 19:05:12 +0200 |
| commit | 57b37ed5199bde590c8fc92bbe12e099163ad070 (patch) | |
| tree | aeac1603c457aa252572172fcce952239101a0ec | |
| parent | 94788118efc9546f1eb446bec325f17814cec884 (diff) | |
| download | linux-57b37ed5199bde590c8fc92bbe12e099163ad070.tar.gz linux-57b37ed5199bde590c8fc92bbe12e099163ad070.tar.bz2 linux-57b37ed5199bde590c8fc92bbe12e099163ad070.zip | |
ARM: at91: prepare common clk transition for sam9260
Enclose the sam9260 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>
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 |