diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-25 10:21:29 +0400 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-25 10:21:29 +0400 |
| commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
| tree | ee891d6236bcd8dc988624839760aaa1846cf906 /arch/arm/mach-imx/common.h | |
| parent | 00efcb1c8e1c3c5e5d3ce6f0682d66402911a84f (diff) | |
| parent | 60480994c70981d0336aadb3f46b052977d3d19f (diff) | |
| download | linux-10b7cdc0084c27a312e59e80420c6aac70c64753.tar.xz | |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
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); void imx_cpu_die(unsigned int cpu); int imx_cpu_kill(unsigned int cpu); -#ifdef CONFIG_PM void imx6q_pm_init(void); void imx6q_pm_set_ccm_base(void __iomem *base); +#ifdef CONFIG_PM void imx5_pm_init(void); #else -static inline void imx6q_pm_init(void) {} -static inline void imx6q_pm_set_ccm_base(void __iomem *base) {} static inline void imx5_pm_init(void) {} #endif |