diff options
author | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
commit | 0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e (patch) | |
tree | 35e597b44cd1af328cb6b02e4f16de51ccd6f979 /arch/arm/mach-kirkwood/common.h | |
parent | aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf (diff) | |
parent | b02b64384696ad13d6a827dc7775489d01b3dfd9 (diff) |
Merge branch 'mvebu/soc-kw' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-kirkwood/common.h')
-rw-r--r-- | arch/arm/mach-kirkwood/common.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 05fd648df543..832a4e2ab8d7 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -58,19 +58,6 @@ void kirkwood_cpufreq_init(void); void kirkwood_restart(enum reboot_mode, const char *); void kirkwood_clk_init(void); -#ifdef CONFIG_PM -void kirkwood_pm_init(void); -#else -static inline void kirkwood_pm_init(void) {}; -#endif - -/* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT -void mv88f6281gtw_ge_init(void); -#else -static inline void mv88f6281gtw_ge_init(void) {}; -#endif - /* early init functions not converted to fdt yet */ char *kirkwood_id(void); void kirkwood_l2_init(void); |