Merge c0842fbc1b
("random32: move the pseudo-random 32-bit definitions to prandom.h") into android-mainline
Baby steps on the way to 5.9-rc1. Resolves merge issues with: arch/arm64/boot/dts/qcom/sdm845-db845c.dts drivers/soc/qcom/Kconfig kernel/sched/cpufreq_schedutil.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ieb3344a22f9cf0d55ec5fc0daebe7602a248ab53
This commit is contained in:
@@ -909,8 +909,4 @@ struct cpufreq_governor *cpufreq_default_governor(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __init sugov_register(void)
|
||||
{
|
||||
return cpufreq_register_governor(&schedutil_gov);
|
||||
}
|
||||
core_initcall(sugov_register);
|
||||
cpufreq_governor_init(schedutil_gov);
|
||||
|
Reference in New Issue
Block a user