[PATCH] Fix ttm_page_alloc.c build breakage

[PATCH] Fix ttm_page_alloc.c build breakage

[Luck, Tony]

The commit 1e8655f87333def92bb8215b423adc65403b08a5
    drm/ttm: Fix build on architectures without AGP

looks at TTM_HAS_AGP before it has been set in ttm_bo_driver.h
    
Move the conditional inclusion of <asm/agp.h> *after* we have included
ttm_bo_driver.h

Signed-of-by: Tony Luck <tony.luck@intel.com>

---

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 1f32b46..f394b3b 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/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

Re: [PATCH] Fix ttm_page_alloc.c build breakage

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

On Wed, 2010-07-21 at 10:15 -0700, Luck, Tony wrote:
> The commit 1e8655f87333def92bb8215b423adc65403b08a5
>     drm/ttm: Fix build on architectures without AGP
> 
> looks at TTM_HAS_AGP before it has been set in ttm_bo_driver.h
>     
> Move the conditional inclusion of <asm/agp.h> *after* we have included
> ttm_bo_driver.h

D'oh, yes.

> Signed-of-by: Tony Luck <tony.luck@intel.com>
Acked-by: Ben Hutchings <ben@decadent.org.uk>

Ben.

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]