Commit-ID: 0f1cf415f00286a38f5ce35b459342dbfc895b50
Gitweb: http://git.kernel.org/tip/0f1cf415f00286a38f5ce35b459342dbfc895b50
Author: Christian Dietrich <qy03fugy@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
AuthorDate: Mon, 6 Sep 2010 16:36:18 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 8 Sep 2010 08:14:02 +0200
x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI
The ACPI/X86_IO_ACPI ifdef isn't necessary at this point,
because it is checked in an outer ifdef level already and has no
effect here.
Cleanup only, no functional effect.
Signed-off-by: Christian Dietrich <qy03fugy@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Borislav Petkov <borislav.petkov@xxxxxxx>
Cc: vamos-dev@xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
LKML-Reference: <d4376e6d79b8dc0f89a4b3ce4a880904a7b93ead.1283782701.git.qy03fugy@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/early-quirks.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index e5cc7e8..e4bd78c 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -98,7 +98,6 @@ 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;
@@ -116,7 +115,6 @@ 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-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|