Messages in this thread Patch in this message | | | Date | Wed, 8 Apr 2009 14:17:57 +0200 | From | Ingo Molnar <> | Subject | Re: [PATCH] early-quirks: remove duplicate #ifdef |
| |
* Jeremy Fitzhardinge <jeremy@goop.org> wrote:
> "#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)" was repeated > twice. > > Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
hm, this was due to the patch below. Your patch essentially reverts that patch?
Ingo
---------------> From a59dacfdc9ba06903652fa4883bf1106278b18ec Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Fri, 17 Oct 2008 14:38:08 +0200 Subject: [PATCH] x86 early quirks: eliminate unused function MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit
Impact: cleanup
this warning:
arch/x86/kernel/early-quirks.c:99: warning: ‘ati_ixp4x0_rev’ defined but not used
triggers because ati_ixp4x0_rev() is only used in the ACPI && X86_IO_APIC case.
Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/x86/kernel/early-quirks.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 76b8cd9..ebdb85c 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -97,6 +97,7 @@ static void __init nvidia_bugs(int num, int slot, int func) } #if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC) +#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC) static u32 __init ati_ixp4x0_rev(int num, int slot, int func) { u32 d; @@ -114,6 +115,7 @@ static u32 __init ati_ixp4x0_rev(int num, int slot, int func) d &= 0xff; return d; } +#endif static void __init ati_bugs(int num, int slot, int func) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |