summaryrefslogtreecommitdiffstats
path: root/include/acpi/cppc_acpi.h
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-11-13 10:58:49 +0100
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-11-13 10:59:10 +0100
commit0ea0397a3a12f9720d6acb78a48da796a54e81aa (patch)
treee2078363019cb2fde493844d7f25293412c4b6df /include/acpi/cppc_acpi.h
parent913240696ec64a2af2de250b1591cc45b5cea2f6 (diff)
parent651022382c7f8da46cb4872a545ee1da6d097d2a (diff)
downloadlinux-0ea0397a3a12f9720d6acb78a48da796a54e81aa.tar.gz
linux-0ea0397a3a12f9720d6acb78a48da796a54e81aa.tar.bz2
linux-0ea0397a3a12f9720d6acb78a48da796a54e81aa.zip
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
drm-next is forwarded to v4.20-rc1, and we need this to make a patch series apply. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/acpi/cppc_acpi.h')
-rw-r--r--include/acpi/cppc_acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
index 8e0b8250a139..cf59e6210d27 100644
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
@@ -104,6 +104,7 @@ enum cppc_regs {
* today.
*/
struct cppc_perf_caps {
+ u32 guaranteed_perf;
u32 highest_perf;
u32 nominal_perf;
u32 lowest_perf;