[git pull] ia64 changes

["Luck, Tony" <tony.luck@intel.com>]

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

commit 1e8655f87333def92bb8215b423adc65403b08a5
Author: Ben Hutchings <ben@decadent.org.uk>
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.
    
    Reported-by: Geert Stappers <stappers@stappers.nl>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Tested-by: Geert Stappers <stappers@stappers.nl>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b1d67dc..1f32b46 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -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