Skip to contentSkip to conversation

ia64 changes

GIT PULL Luck, Tony 1 participant 1 message Jul 21, 2010

Subsystems (3)
lore
Share & tools
lore

Luck, Tony

author
#0 lore raw

This commit hit Linus upstream today and broke the ia64 build:

commit 1e8655f87333def92bb8215b423adc65403b08a5

Author: Ben Hutchings <[email protected]>
Date:   Sun Jul 18 21:51:42 2010 +0100

drm/ttm: Fix build on architectures without AGP

Make inclusion of <asm/agp.h> conditional on TTM_HAS_AGP. The use of the functions declared in it is already conditional.

drivers/gpu/drm/ttm/ttm_page_alloc.c +2 -0
index b1d67dc..1f32b46 100644
@@ -40,7 +40,9 @@
 #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"

The problem is that TTM_HAS_AGP is defined in "ttm/ttm_bo_driver.h" ... which is included *after* you used it to test whether to include <asm/agp.h>

I suspect some re-arrangement is in order :-)

-Tony