diff options
| author | Luck, Tony <tony.luck@intel.com> | 2010-07-21 10:15:39 -0700 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-22 10:02:32 +1000 |
| commit | d667865114d10723f4d22cc5b7bf2c743d1f2198 (patch) | |
| tree | 77f01dd34f89420e428cd2da0a10d8a974df219d /drivers/gpu | |
| parent | 15cb02c0a0338ee724bf23e31c7c410ecbffeeba (diff) | |
| download | op-kernel-dev-d667865114d10723f4d22cc5b7bf2c743d1f2198.zip op-kernel-dev-d667865114d10723f4d22cc5b7bf2c743d1f2198.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc.c | 6 |
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 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 |
