diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 23:51:10 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 23:51:10 +0200 |
| commit | 03a1e74cad817a381b4789fb9cc39c47c263c8a8 (patch) | |
| tree | 3f9bd36b1cc4fcfdb25d065033423dd9e135f6ee /drivers/cpuidle | |
| parent | Merge tag 'mvebu-fixes-4.0' of git://git.infradead.org/linux-mvebu into fixes (diff) | |
| parent | ARM: EXYNOS: Fix build breakage cpuidle on !SMP (diff) | |
| download | linux-03a1e74cad817a381b4789fb9cc39c47c263c8a8.tar.xz linux-03a1e74cad817a381b4789fb9cc39c47c263c8a8.zip | |
Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung 2nd fixes for v4.0" from Kukjin Kim:
- Fix build breakage exynos cpuidle driver on !SMP
because it is coupled built-in so added check for SMP.
- Fix lid, power pin-functions and mmc node updates
for exynos5250-spring: Fixes commit ID 53dd4138bb0a
("ARM: dts: Add exynos5250-spring device tree")
* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix build breakage cpuidle on !SMP
ARM: dts: fix lid and power pin-functions for exynos5250-spring
ARM: dts: fix mmc node updates for exynos5250-spring
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/cpuidle')
| -rw-r--r-- | drivers/cpuidle/cpuidle-exynos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-exynos.c b/drivers/cpuidle/cpuidle-exynos.c index 26f5f29fdb03..9bb5348995a9 100644 --- a/drivers/cpuidle/cpuidle-exynos.c +++ b/drivers/cpuidle/cpuidle-exynos.c @@ -117,7 +117,8 @@ static int exynos_cpuidle_probe(struct platform_device *pdev) { int ret; - if (of_machine_is_compatible("samsung,exynos4210")) { + if (IS_ENABLED(CONFIG_SMP) && + of_machine_is_compatible("samsung,exynos4210")) { exynos_cpuidle_pdata = pdev->dev.platform_data; ret = cpuidle_register(&exynos_coupled_idle_driver, |