drm/radeon: Move AGP helpers into radeon driver

[linux-2.6-microblaze.git] / drivers / gpu / drm / radeon / radeon_drv.c

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index efeb115..7a9cd59 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -38,6 +38,7 @@
 #include <linux/mmu_notifier.h>
 #include <linux/pci.h>
 
+#include <drm/drm_aperture.h>
 #include <drm/drm_agpsupport.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_drv.h>
@@ -330,7 +331,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
                return -EPROBE_DEFER;
 
        /* Get rid of things like offb */
-       ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
+       ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
        if (ret)
                return ret;
 
@@ -345,7 +346,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
        pci_set_drvdata(pdev, dev);
 
        if (pci_find_capability(pdev, PCI_CAP_ID_AGP))
-               dev->agp = drm_agp_init(dev);
+               dev->agp = radeon_agp_head_init(dev);
        if (dev->agp) {
                dev->agp->agp_mtrr = arch_phys_wc_add(
                        dev->agp->agp_info.aper_base,