diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-02-19 17:22:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-19 17:22:34 +0100 |
| commit | 4a9226a3d192c38493106dcaf5f47f291ede9ed5 (patch) | |
| tree | f5791e3147b713e02b69c528644a8a2d41b3ea7f /arch/arm/mach-imx/cpuidle.h | |
| parent | Merge tag 'imx-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into late/dt (diff) | |
| parent | ARM: imx6q: support WAIT mode using cpuidle (diff) | |
| download | linux-dev-4a9226a3d192c38493106dcaf5f47f291ede9ed5.tar.xz linux-dev-4a9226a3d192c38493106dcaf5f47f291ede9ed5.zip | |
Merge branch 'imx/cpuidle' into late/dt
This resolves one non-obvious merge conflict between the imx cpuidle
patches and the imx DT changes for 3.9.
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/cpuidle.h')
| -rw-r--r-- | arch/arm/mach-imx/cpuidle.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h index bc932d1af372..e092d1359d94 100644 --- a/arch/arm/mach-imx/cpuidle.h +++ b/arch/arm/mach-imx/cpuidle.h @@ -14,9 +14,14 @@ #ifdef CONFIG_CPU_IDLE extern int imx_cpuidle_init(struct cpuidle_driver *drv); +extern int imx6q_cpuidle_init(void); #else static inline int imx_cpuidle_init(struct cpuidle_driver *drv) { return -ENODEV; } +static inline int imx6q_cpuidle_init(void) +{ + return -ENODEV; +} #endif |