public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Simon Holm Thøgersen" <odie@cs.aau.dk>
To: Ingo Molnar <mingo@elte.hu>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: fix compile warning for !(ACPI && X86_IO_APIC) builds
Date: Tue, 14 Oct 2008 01:00:50 +0200	[thread overview]
Message-ID: <1223938850.21717.21.camel@odie.local> (raw)

This fixes the following compile warning for !(ACPI && X86_IO_APIC) builds:

arch/x86/kernel/early-quirks.c:99: warning: 'ati_ixp4x0_rev' defined
but not used

that was introduced by 33fb0e4 (x86: SB450: skip IRQ0 override if it is not
routed to INT2 of IOAPIC).

Signed-off-by: Simon Holm Thøgersen <odie@cs.aau.dk>
---
 arch/x86/kernel/early-quirks.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 733c4f8..f60afb6 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -95,6 +95,7 @@ static void __init nvidia_bugs(int num, int slot, int func)
 
 }
 
+#if defined(CONFIG_ACPI) && defined (CONFIG_X86_IO_APIC)
 static u32 ati_ixp4x0_rev(int num, int slot, int func)
 {
 	u32 d;
@@ -115,7 +116,6 @@ static u32 ati_ixp4x0_rev(int num, int slot, int func)
 
 static void __init ati_bugs(int num, int slot, int func)
 {
-#if defined(CONFIG_ACPI) && defined (CONFIG_X86_IO_APIC)
 	u32 d;
 	u8  b;
 
@@ -138,8 +138,12 @@ static void __init ati_bugs(int num, int slot, int func)
 		printk(KERN_INFO "If you got timer trouble "
 		       "try acpi_use_timer_override\n");
 	}
-#endif
 }
+#else
+static void __init ati_bugs(int num, int slot, int func)
+{
+}
+#endif
 
 #ifdef CONFIG_DMAR
 static void __init intel_g33_dmar(int num, int slot, int func)
-- 
1.5.6.2.255.gbed62


             reply	other threads:[~2008-10-13 22:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-13 23:00 Simon Holm Thøgersen [this message]
2008-10-14 11:53 ` [PATCH] x86: fix compile warning for !(ACPI && X86_IO_APIC) builds Andreas Herrmann
2008-10-16 11:57   ` Andreas Herrmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1223938850.21717.21.camel@odie.local \
    --to=odie@cs.aau.dk \
    --cc=andreas.herrmann3@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox