Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6678651 authored by Tony Luck's avatar Tony Luck Committed by Dave Airlie
Browse files

Fix ttm_page_alloc.c build breakage 



The commit 1e8655f8
    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: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 15cb02c0

drivers/gpu/drm/ttm/ttm_page_alloc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -40,13 +40,13 @@ 
#include <linux/slab.h>

#include <linux/slab.h>





#include <asm/atomic.h>

#include <asm/atomic.h>

#ifdef TTM_HAS_AGP

#include <asm/agp.h>

#endif





#include "ttm/ttm_bo_driver.h"

#include "ttm/ttm_bo_driver.h"

#include "ttm/ttm_page_alloc.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 NUM_PAGES_TO_ALLOC		(PAGE_SIZE/sizeof(struct page *))

#define SMALL_ALLOCATION		16

#define SMALL_ALLOCATION		16