summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-02-24 23:30:05 +0100
committerOlof Johansson <olof@lixom.net>2016-02-24 23:30:05 +0100
commit6997e172dc529b9f6780ae71fc7eaea31ece8b25 (patch)
tree3a987c4ef7ff548a4b8a81bd4f683f8a91a34b9f /drivers/cpufreq
parentMerge tag 'v4.6-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentcpufreq: s5pv210: remove superfluous CONFIG_PM ifdefs (diff)
downloadlinux-6997e172dc529b9f6780ae71fc7eaea31ece8b25.tar.xz
linux-6997e172dc529b9f6780ae71fc7eaea31ece8b25.zip
Merge tag 'samsung-drivers-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers
Exynos-specific driver changes for v4.6: 1. Minor cleanup in s5pv210-cpufreq driver. * tag 'samsung-drivers-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: cpufreq: s5pv210: remove superfluous CONFIG_PM ifdefs Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/s5pv210-cpufreq.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index 051a8a8224cd..a145b319d171 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -576,10 +576,8 @@ static struct cpufreq_driver s5pv210_driver = {
.get = cpufreq_generic_get,
.init = s5pv210_cpu_init,
.name = "s5pv210",
-#ifdef CONFIG_PM
.suspend = cpufreq_generic_suspend,
.resume = cpufreq_generic_suspend, /* We need to set SLEEP FREQ again */
-#endif
};
static struct notifier_block s5pv210_cpufreq_reboot_notifier = {