From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 4 Mar 2019 10:19:14 +0000 (+0100)
Subject: Merge branch 'pm-opp'
X-Git-Tag: v5.1-rc1~151^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1271d6d576b7e7c80519de211f250cfd4eebca1a;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pm-opp'

* pm-opp:
  cpufreq: OMAP: Register an Energy Model
  cpufreq: imx6q: Register an Energy Model
  opp: no need to check return value of debugfs_create functions
  cpufreq: mediatek: Register an Energy Model
  cpufreq: scmi: Register an Energy Model
  cpufreq: arm_big_little: Register an Energy Model
  cpufreq: scpi: Register an Energy Model
  cpufreq: dt: Register an Energy Model
---

1271d6d576b7e7c80519de211f250cfd4eebca1a
diff --cc drivers/cpufreq/scmi-cpufreq.c
index c47182fc64ead,0d87e14332962..e6182c89df797
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@@ -11,6 -11,8 +11,7 @@@
  #include <linux/cpu.h>
  #include <linux/cpufreq.h>
  #include <linux/cpumask.h>
 -#include <linux/cpu_cooling.h>
+ #include <linux/energy_model.h>
  #include <linux/export.h>
  #include <linux/module.h>
  #include <linux/pm_opp.h>