diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 17:30:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 17:30:54 +0200 |
| commit | 57f0b2014135235d5bf03834dee1284629ce50d2 (patch) | |
| tree | bf2859249c8ff69daa8158c43795388256f53cea /include/linux | |
| parent | 5f870baa18656be6dae856f96e3b2426ae83d69b (diff) | |
| parent | db43b184685632b7c23ccd47ec08b61010d55798 (diff) | |
| download | linux-stable-57f0b2014135235d5bf03834dee1284629ce50d2.tar.gz linux-stable-57f0b2014135235d5bf03834dee1284629ce50d2.tar.bz2 linux-stable-57f0b2014135235d5bf03834dee1284629ce50d2.zip | |
Merge branch 'randconfig/mach' into fixes
Small platform specific bug fixes for problems found in randconfig builds.
* randconfig/mach:
ARM: ux500: don't select LEDS_GPIO for snowball
ARM: imx: build i.MX6 functions only when needed
ARM: imx: select CPU_FREQ_TABLE when needed
ARM: imx: fix ksz9021rn_phy_fixup
ARM: imx: build pm-imx5 code only when PM is enabled
ARM: omap: allow building omap44xx without SMP
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpuidle.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 040b13b5c14a..279b1eaa8b73 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -194,6 +194,10 @@ static inline int cpuidle_play_dead(void) {return -ENODEV; } #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a); +#else +static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a) +{ +} #endif /****************************** |