summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/drm_drv.c
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-08-17 15:31:40 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-08-17 15:31:40 +0000
commitb1361f1b0a19418bf243bd22c7ec8e3d999642c3 (patch)
tree0d253834edf485512f01b090e551bdaac781bc8e /sys/dev/pci/drm/drm_drv.c
parent4c0300ad9e08841d3f27db4d7b6cdb6d8716ab3f (diff)
Kill some redundant ifdefs, they're taken care of elsewhere.
Diffstat (limited to 'sys/dev/pci/drm/drm_drv.c')
-rw-r--r--sys/dev/pci/drm/drm_drv.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 476fd9906af..646d9400dbf 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -419,13 +419,11 @@ drm_load(struct drm_device *dev)
retcode = ENOMEM;
goto error;
}
-#ifndef DRM_NO_MTRR
if (dev->agp != NULL) {
if (drm_mtrr_add(dev->agp->info.ai_aperture_base,
dev->agp->info.ai_aperture_size, DRM_MTRR_WC) == 0)
dev->agp->mtrr = 1;
}
-#endif
}
retcode = drm_ctxbitmap_init(dev);
@@ -456,7 +454,6 @@ drm_unload(struct drm_device *dev)
drm_memrange_takedown(&dev->handle_mm);
-#if !defined(DRM_NO_MTRR) && !defined(DRM_NO_AGP)
if (dev->agp && dev->agp->mtrr) {
int retcode;
@@ -464,7 +461,6 @@ drm_unload(struct drm_device *dev)
dev->agp->info.ai_aperture_size, DRM_MTRR_WC);
DRM_DEBUG("mtrr_del = %d", retcode);
}
-#endif
DRM_LOCK();
drm_lastclose(dev);