diff options
Diffstat (limited to 'arch/arm/mach-imx/common.h')
-rw-r--r-- | arch/arm/mach-imx/common.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index cb6c838b63ed..4517fd760bfc 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h | |||
@@ -137,7 +137,6 @@ extern void imx_gpc_restore_all(void); | |||
137 | extern void imx_anatop_init(void); | 137 | extern void imx_anatop_init(void); |
138 | extern void imx_anatop_pre_suspend(void); | 138 | extern void imx_anatop_pre_suspend(void); |
139 | extern void imx_anatop_post_resume(void); | 139 | extern void imx_anatop_post_resume(void); |
140 | extern void imx_anatop_usb_chrg_detect_disable(void); | ||
141 | extern u32 imx_anatop_get_digprog(void); | 140 | extern u32 imx_anatop_get_digprog(void); |
142 | extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); | 141 | extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); |
143 | extern void imx6q_set_chicken_bit(void); | 142 | extern void imx6q_set_chicken_bit(void); |
@@ -147,12 +146,10 @@ extern int imx_cpu_kill(unsigned int cpu); | |||
147 | 146 | ||
148 | #ifdef CONFIG_PM | 147 | #ifdef CONFIG_PM |
149 | extern void imx6q_pm_init(void); | 148 | extern void imx6q_pm_init(void); |
150 | extern void imx51_pm_init(void); | 149 | extern void imx5_pm_init(void); |
151 | extern void imx53_pm_init(void); | ||
152 | #else | 150 | #else |
153 | static inline void imx6q_pm_init(void) {} | 151 | static inline void imx6q_pm_init(void) {} |
154 | static inline void imx51_pm_init(void) {} | 152 | static inline void imx5_pm_init(void) {} |
155 | static inline void imx53_pm_init(void) {} | ||
156 | #endif | 153 | #endif |
157 | 154 | ||
158 | #ifdef CONFIG_NEON | 155 | #ifdef CONFIG_NEON |
@@ -161,6 +158,12 @@ extern int mx51_neon_fixup(void); | |||
161 | static inline int mx51_neon_fixup(void) { return 0; } | 158 | static inline int mx51_neon_fixup(void) { return 0; } |
162 | #endif | 159 | #endif |
163 | 160 | ||
161 | #ifdef CONFIG_CACHE_L2X0 | ||
162 | extern void imx_init_l2cache(void); | ||
163 | #else | ||
164 | static inline void imx_init_l2cache(void) {} | ||
165 | #endif | ||
166 | |||
164 | extern struct smp_operations imx_smp_ops; | 167 | extern struct smp_operations imx_smp_ops; |
165 | 168 | ||
166 | #endif | 169 | #endif |