diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
commit | 5acac83bf2e42f51ab9fd315d657798754bf0bb8 (patch) | |
tree | 564be60664226649f00798cc3afb72d72d0ed24d /drivers/cpufreq/pmac32-cpufreq.c | |
parent | Input: cyttsp - verbose error on soft reset (diff) | |
parent | Linux 5.12-rc4 (diff) | |
download | linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.tar.xz linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.zip |
Merge tag 'v5.12-rc4' into next
Sync up with the mainline to bring in newest APIs.
Diffstat (limited to 'drivers/cpufreq/pmac32-cpufreq.c')
-rw-r--r-- | drivers/cpufreq/pmac32-cpufreq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c index 73621bc11976..4f20c6a9108d 100644 --- a/drivers/cpufreq/pmac32-cpufreq.c +++ b/drivers/cpufreq/pmac32-cpufreq.c @@ -439,8 +439,7 @@ static struct cpufreq_driver pmac_cpufreq_driver = { .init = pmac_cpufreq_cpu_init, .suspend = pmac_cpufreq_suspend, .resume = pmac_cpufreq_resume, - .flags = CPUFREQ_PM_NO_WARN | - CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING, + .flags = CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING, .attr = cpufreq_generic_attr, .name = "powermac", }; |