Fix ttm_page_alloc.c build breakage
authorLuck, Tony <tony.luck@intel.com>
Wed, 21 Jul 2010 17:15:39 +0000 (10:15 -0700)
committerDave Airlie <airlied@redhat.com>
Thu, 22 Jul 2010 00:02:32 +0000 (10:02 +1000)
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>
drivers/gpu/drm/ttm/ttm_page_alloc.c

index 1f32b460adceff38c58a06073eb18f7d14fc26ec..f394b3b2fadf91fd5caa088d5204ea57882579a9 100644 (file)
 #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