diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-24 14:30:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-24 14:30:05 -0800 |
| commit | 6997e172dc529b9f6780ae71fc7eaea31ece8b25 (patch) | |
| tree | 3a987c4ef7ff548a4b8a81bd4f683f8a91a34b9f /drivers | |
| parent | 55d90a3ea67c255cbf5e083be17aacf6b2c05014 (diff) | |
| parent | 9b3f105ef6c75ef4f7f1bd982195db814830d78b (diff) | |
| download | linux-6997e172dc529b9f6780ae71fc7eaea31ece8b25.tar.bz2 | |
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')
| -rw-r--r-- | drivers/cpufreq/s5pv210-cpufreq.c | 2 |
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 = { |