Skip to content

Commit

Permalink
Fix ttm_page_alloc.c build breakage
Browse files Browse the repository at this point in the history
The commit 1e8655f
    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>
  • Loading branch information
Luck, Tony authored and Dave Airlie committed Jul 22, 2010
1 parent 15cb02c commit d667865
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/ttm/ttm_page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d667865

Please sign in to comment.