Merge branch 'next' into for-linus

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 962e75dc4781..0a4185279417 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -898,6 +898,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_B43_HB),
         ID(PCI_DEVICE_ID_INTEL_B43_1_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB),
+        ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D2_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB),
@@ -907,6 +908,11 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_HB),
         ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),
         ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),
+        ID(PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_M_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_S_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB),
         { }
 };