Merge tag 'v3.5-rc4' into drm-intel-next-queued

[~andy/linux] / drivers / char / agp / intel-agp.c

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 0a41852794177636f62c91010430d85891f1425b..92622d44e12d294ef8014050836f4af4d1f9f2f3 100644 (file)
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -12,6 +12,7 @@
 #include <asm/smp.h>
 #include "agp.h"
 #include "intel-agp.h"
+#include <drm/intel-gtt.h>
 
 int intel_agp_enabled;
 EXPORT_SYMBOL(intel_agp_enabled);
@@ -747,7 +748,7 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
 
        bridge->capndx = cap_ptr;
 
-       if (intel_gmch_probe(pdev, bridge))
+       if (intel_gmch_probe(pdev, NULL, bridge))
                goto found_gmch;
 
        for (i = 0; intel_agp_chipsets[i].name != NULL; i++) {
@@ -824,7 +825,7 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)
 
        agp_remove_bridge(bridge);
 
-       intel_gmch_remove(pdev);
+       intel_gmch_remove();
 
        agp_put_bridge(bridge);
 }