diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-03-26 15:11:04 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-03-26 15:11:04 +0100 |
| commit | c1b164a5f7ab932699923f58c95767bfc6921d91 (patch) | |
| tree | b664c14d00f41eb1f51aaf61dabbececfcac8518 /drivers/gpu/drm/i915/display/intel_opregion.c | |
| parent | 873863b6214a034e8d4e4bfc8232f65bf9a292fe (diff) | |
| parent | c2556238120bce8be37670e145226c12870a9e5a (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
Requested for getting some i915 fixes back into drm-misc-next by danvet.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_opregion.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_opregion.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index dfd78fccd456..cc6b00959586 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.c +++ b/drivers/gpu/drm/i915/display/intel_opregion.c @@ -30,8 +30,6 @@ #include <linux/firmware.h> #include <acpi/video.h> -#include <drm/i915_drm.h> - #include "display/intel_panel.h" #include "i915_drv.h" |