From 0068356588803e7720d70f2e550d5da3989b340a Mon Sep 17 00:00:00 2001
From: "Luck, Tony" <tony.luck@intel.com>
Date: Wed, 21 Jul 2010 10:15:39 -0700
Subject: [PATCH] --- yaml --- r: 201165 b: refs/heads/master c:
 d667865114d10723f4d22cc5b7bf2c743d1f2198 h: refs/heads/master i:   201163:
 af0770629d179d4539999a1d1d9062886b88dc97 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f38ec44e52d0..b6118f11eec0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15cb02c0a0338ee724bf23e31c7c410ecbffeeba
+refs/heads/master: d667865114d10723f4d22cc5b7bf2c743d1f2198
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 1f32b460adce..f394b3b2fadf 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -40,13 +40,13 @@
 #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"
 
+#ifdef TTM_HAS_AGP
+#include <asm/agp.h>
+#endif
 
 #define NUM_PAGES_TO_ALLOC		(PAGE_SIZE/sizeof(struct page *))
 #define SMALL_ALLOCATION		16