diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
| commit | 13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch) | |
| tree | bc2c78c3b816a65f90c31cccebdc15b38352c045 /arch/arm/mach-imx/common.h | |
| parent | 6d8b3e1ad3d3815d9c87b8553493301e243af76a (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'arch/arm/mach-imx/common.h')
| -rw-r--r-- | arch/arm/mach-imx/common.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 59c3b9b26bb4..baf439dc22d8 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h | |||
| @@ -144,13 +144,11 @@ void imx6q_set_chicken_bit(void); | |||
| 144 | void imx_cpu_die(unsigned int cpu); | 144 | void imx_cpu_die(unsigned int cpu); |
| 145 | int imx_cpu_kill(unsigned int cpu); | 145 | int imx_cpu_kill(unsigned int cpu); |
| 146 | 146 | ||
| 147 | #ifdef CONFIG_PM | ||
| 148 | void imx6q_pm_init(void); | 147 | void imx6q_pm_init(void); |
| 149 | void imx6q_pm_set_ccm_base(void __iomem *base); | 148 | void imx6q_pm_set_ccm_base(void __iomem *base); |
| 149 | #ifdef CONFIG_PM | ||
| 150 | void imx5_pm_init(void); | 150 | void imx5_pm_init(void); |
| 151 | #else | 151 | #else |
| 152 | static inline void imx6q_pm_init(void) {} | ||
| 153 | static inline void imx6q_pm_set_ccm_base(void __iomem *base) {} | ||
| 154 | static inline void imx5_pm_init(void) {} | 152 | static inline void imx5_pm_init(void) {} |
| 155 | #endif | 153 | #endif |
| 156 | 154 | ||