Merge bk://drm.bkbits.net/drm-2.6

into starflyer.(none):/home/airlied/drm/drm-2.6

Merge bk://drm.bkbits.net/drm-2.6
into starflyer.(none):/home/airlied/drm/drm-2.6
7fcd9709 · Dave Airlie · 6ad2ec23 · a3631e76 · 7fcd9709
Commit 7fcd9709 authored Jun 07, 2004 by Dave Airlie
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

drivers/char/drm/drm_agpsupport.h drivers/char/drm/drm_agpsupport.h +0 -2

No files found.
--- a/drivers/char/drm/drm_agpsupport.h
+++ b/drivers/char/drm/drm_agpsupport.h
@@ -109,8 +109,6 @@ int DRM(agp_acquire)(struct inode *inode, struct file *filp,
 		return -EBUSY;
 	if (!drm_agp->acquire)
 		return -EINVAL;
-	if ( dev->agp->cant_use_aperture )
-		return -EINVAL;
 	if ((retcode = drm_agp->acquire()))
 		return retcode;
 	dev->agp->acquired = 1;