From bb9a3e511b9674605d42a3f2170e108be663484f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 18 Jul 2010 21:51:42 +0100
Subject: [PATCH] --- yaml --- r: 201113 b: refs/heads/master c:
 1e8655f87333def92bb8215b423adc65403b08a5 h: refs/heads/master i:   201111:
 107b99b776b4d01f9cba1474e3c1ddb5a787c7d5 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 92830111f530..e40e9f524e49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d369bb196f1f9111cb7ab839d4f420378fa7b30
+refs/heads/master: 1e8655f87333def92bb8215b423adc65403b08a5
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b1d67dc973dc..1f32b460adce 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/trunk/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"