Merge tag 'v4.4-rc2' into drm-intel-next-queued

[mirror_ubuntu-zesty-kernel.git] / drivers / pci / quirks.c

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7e327309cf69f612b05cdb1544ff5c4deba9f68e..c2dd52ea419889f9a3e0c0341da828a3a06f75e2 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3405,7 +3405,9 @@ static int reset_intel_82599_sfp_virtfn(struct pci_dev *dev, int probe)
        return 0;
 }
 
-#include "../gpu/drm/i915/i915_reg.h"
+#define SOUTH_CHICKEN2         0xc2004
+#define PCH_PP_STATUS          0xc7200
+#define PCH_PP_CONTROL         0xc7204
 #define MSG_CTL                        0x45010
 #define NSDE_PWR_STATE         0xd0100
 #define IGD_OPERATION_TIMEOUT  10000     /* set timeout 10 seconds */