From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 18 Jul 2010 20:51:42 +0000 (+0100)
Subject: drm/ttm: Fix build on architectures without AGP
X-Git-Tag: upstream/snapshot3+hdmi~13856^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e8655f87333def92bb8215b423adc65403b08a5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

drm/ttm: Fix build on architectures without AGP

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>
---

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b1d67dc..1f32b46 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -40,7 +40,9 @@
 #include <linux/slab.h>
 
 #include <asm/atomic.h>
+#ifdef TTM_HAS_AGP
 #include <asm/agp.h>
+#endif
 
 #include "ttm/ttm_bo_driver.h"
 #include "ttm/ttm_page_alloc.h"