diff -Naru a/drivers/char/drm/drm_agpsupport.h b/drivers/char/drm/drm_agpsupport.h
--- a/drivers/char/drm/drm_agpsupport.h	2005-04-14 03:20:37 -07:00
+++ b/drivers/char/drm/drm_agpsupport.h	2005-04-14 03:20:37 -07:00
@@ -109,8 +109,6 @@
 		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;
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/06/05 10:59:01-07:00 benh@kernel.crashing.org 
#   [PATCH] Fix DRM mismerge(?)
#   
#   From: Colin Leroy <colin@colino.net>
#   
#   Paulus brought this up on IRC, it seems to be a bad DRM merge: The code
#   
#   #ifndef VMAP_4_ARGS
#          if ( dev->agp->cant_use_aperture )
#                  return -EINVAL;
#   #endif
#   
#   in DRM(agp_acquire) should be removed altogether in a 2.6 kernel because
#   its vmap() takes 4 arguments; however, only the guards seem to have been
#   removed, which causes this function to erroneously fail if the AGP aperture
#   can't be directly accessed by the CPU.
#   
#   Signed-off-by: Colin Leroy <colin@colino.net>
#   Signed-off-by: Andrew Morton <akpm@osdl.org>
#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
# 
# drivers/char/drm/drm_agpsupport.h
#   2004/06/05 00:25:30-07:00 benh@kernel.crashing.org +0 -2
#   Fix DRM mismerge(?)
#