From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751822Ab0GUQlB (ORCPT ); Wed, 21 Jul 2010 12:41:01 -0400 Received: from mga09.intel.com ([134.134.136.24]:14274 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750838Ab0GUQk5 (ORCPT ); Wed, 21 Jul 2010 12:40:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.55,239,1278313200"; d="scan'208";a="537544612" From: "Luck, Tony" To: "Ben Hutchings" Cc: linux-kernel@vger.kernel.org, "Geert Stappers" , "Dave Airlie" Subject: [git pull] ia64 changes Date: Wed, 21 Jul 2010 09:40:57 -0700 Message-Id: <4c47231922590620a5@agluck-desktop.sc.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit hit Linus upstream today and broke the ia64 build: commit 1e8655f87333def92bb8215b423adc65403b08a5 Author: Ben Hutchings Date: Sun Jul 18 21:51:42 2010 +0100 drm/ttm: Fix build on architectures without AGP Make inclusion of conditional on TTM_HAS_AGP. The use of the functions declared in it is already conditional. Reported-by: Geert Stappers Signed-off-by: Ben Hutchings Tested-by: Geert Stappers Signed-off-by: Dave Airlie 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 #include +#ifdef TTM_HAS_AGP #include +#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 I suspect some re-arrangement is in order :-) -Tony