p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandre Belloni 2014-04-10 20:18:19 +02:00
parent 152f3003f0
commit 36c203f1ca
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-at91/at91rm9200.c
View File

@ -26,10 +26,11 @@
#include "at91_aic.h" #include "at91_aic.h"
#include "soc.h" #include "soc.h"
#include "generic.h" #include "generic.h"
#include "clock.h"
#include "sam9_smc.h" #include "sam9_smc.h"
#include "pm.h" #include "pm.h"
#if defined(CONFIG_OLD_CLK_AT91)
#include "clock.h"
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* Clocks * Clocks
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
@ -277,6 +278,9 @@ static void __init at91rm9200_register_clocks(void)
clk_register(&pck2); clk_register(&pck2);
clk_register(&pck3); clk_register(&pck3);
} }
#else
#define at91rm9200_register_clocks NULL
#endif
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* GPIO * GPIO