aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2010-07-21 13:15:39 -0400
committerDave Airlie <airlied@redhat.com>2010-07-21 20:02:32 -0400
commitd667865114d10723f4d22cc5b7bf2c743d1f2198 (patch)
tree77f01dd34f89420e428cd2da0a10d8a974df219d
parent15cb02c0a0338ee724bf23e31c7c410ecbffeeba (diff)
Fix ttm_page_alloc.c build breakage
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> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/ttm/ttm_page_alloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 1f32b460adce..f394b3b2fadf 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -40,13 +40,13 @@
40#include <linux/slab.h> 40#include <linux/slab.h>
41 41
42#include <asm/atomic.h> 42#include <asm/atomic.h>
43#ifdef TTM_HAS_AGP
44#include <asm/agp.h>
45#endif
46 43
47#include "ttm/ttm_bo_driver.h" 44#include "ttm/ttm_bo_driver.h"
48#include "ttm/ttm_page_alloc.h" 45#include "ttm/ttm_page_alloc.h"
49 46
47#ifdef TTM_HAS_AGP
48#include <asm/agp.h>
49#endif
50 50
51#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *)) 51#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
52#define SMALL_ALLOCATION 16 52#define SMALL_ALLOCATION 16