drm/ttm: Fix build on architectures without AGP
authorBen Hutchings <ben@decadent.org.uk>
Sun, 18 Jul 2010 20:51:42 +0000 (21:51 +0100)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Jul 2010 05:24:06 +0000 (15:24 +1000)
Make inclusion of <asm/agp.h> conditional on TTM_HAS_AGP.  The use
of the functions declared in it is already conditional.

Reported-by: Geert Stappers <stappers@stappers.nl>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Tested-by: Geert Stappers <stappers@stappers.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/ttm/ttm_page_alloc.c

index b1d67dc..1f32b46 100644 (file)
@@ -40,7 +40,9 @@
 #include <linux/slab.h>
 
 #include <asm/atomic.h>
 #include <linux/slab.h>
 
 #include <asm/atomic.h>
+#ifdef TTM_HAS_AGP
 #include <asm/agp.h>
 #include <asm/agp.h>
+#endif
 
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_page_alloc.h"
 
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_page_alloc.h"