From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757324AbYJ3VCV (ORCPT ); Thu, 30 Oct 2008 17:02:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754350AbYJ3VCD (ORCPT ); Thu, 30 Oct 2008 17:02:03 -0400 Received: from accolon.hansenpartnership.com ([76.243.235.52]:56446 "EHLO accolon.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753847AbYJ3VCA (ORCPT ); Thu, 30 Oct 2008 17:02:00 -0400 Subject: [PATCH] fix ACPI induced voyager compile failure From: James Bottomley To: Ingo Molnar , Thomas Gleixner Cc: linux-kernel Content-Type: text/plain Date: Thu, 30 Oct 2008 16:01:58 -0500 Message-Id: <1225400518.19324.11.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 (2.22.3.1-1.fc9) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From c339b7cdc39399855ec07dfbff67304f9c7fa49a Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Wed, 29 Oct 2008 10:58:13 -0500 Subject: [VOYAGER] x86: don't pull asm/acpi.h into fixmap_32.h If it's not needed it causes compile failures. Signed-off-by: James Bottomley --- arch/x86/include/asm/fixmap_32.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/fixmap_32.h b/arch/x86/include/asm/fixmap_32.h index 09f29ab..c3302ee 100644 --- a/arch/x86/include/asm/fixmap_32.h +++ b/arch/x86/include/asm/fixmap_32.h @@ -25,7 +25,9 @@ extern unsigned long __FIXADDR_TOP; #ifndef __ASSEMBLY__ #include +#ifdef CONFIG_ACPI #include +#endif #include #include #ifdef CONFIG_HIGHMEM -- 1.5.6.5