diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-23 08:21:37 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-23 08:21:37 +0100 |
commit | 03c1136af504bbc2cabda76af6b27fd5f7cf8a7d (patch) | |
tree | 6c53a0f635b4339571050006191a950e3f5db93c /drivers/cpufreq/cpufreq_governor.h | |
parent | staging: vt6655: Remove useless else (diff) | |
parent | Linux 5.10-rc5 (diff) | |
download | linux-03c1136af504bbc2cabda76af6b27fd5f7cf8a7d.tar.xz linux-03c1136af504bbc2cabda76af6b27fd5f7cf8a7d.zip |
Merge 5.10-rc5 into staging-testing
We want the staging/IIO fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/cpufreq/cpufreq_governor.h')
-rw-r--r-- | drivers/cpufreq/cpufreq_governor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index c56773c25757..bab8e6140377 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@ -156,7 +156,7 @@ void cpufreq_dbs_governor_limits(struct cpufreq_policy *policy); #define CPUFREQ_DBS_GOVERNOR_INITIALIZER(_name_) \ { \ .name = _name_, \ - .dynamic_switching = true, \ + .flags = CPUFREQ_GOV_DYNAMIC_SWITCHING, \ .owner = THIS_MODULE, \ .init = cpufreq_dbs_governor_init, \ .exit = cpufreq_dbs_governor_exit, \ |