From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Feb 2019 01:01:09 +0000 (+1100)
Subject: Merge remote-tracking branch 'drm-intel/for-linux-next'
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=f75157d9f9d4e5a97b4720ec42ae28f92acb0c35;p=linux

Merge remote-tracking branch 'drm-intel/for-linux-next'
---

f75157d9f9d4e5a97b4720ec42ae28f92acb0c35
diff --cc drivers/gpu/drm/i915/i915_pci.c
index 5d05572c9ff4,36fa6f1905fc..66f82f3f050f
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -26,8 -26,7 +26,9 @@@
  #include <linux/vgaarb.h>
  #include <linux/vga_switcheroo.h>
  
 +#include <drm/drm_drv.h>
 +
+ #include "i915_active.h"
  #include "i915_drv.h"
  #include "i915_selftest.h"