aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/early-quirks.c
diff options
context:
space:
mode:
authorChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>2010-09-06 10:36:18 -0400
committerIngo Molnar <mingo@elte.hu>2010-09-08 02:14:02 -0400
commit0f1cf415f00286a38f5ce35b459342dbfc895b50 (patch)
tree3e2af714bf9ee6235626d04518b40b5ddbdd37b1 /arch/x86/kernel/early-quirks.c
parentf6e9456c9272bb570df6e217cdbe007e270b1c4e (diff)
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@stud.informatik.uni-erlangen.de> Acked-by: Borislav Petkov <borislav.petkov@amd.com> Cc: vamos-dev@i4.informatik.uni-erlangen.de LKML-Reference: <d4376e6d79b8dc0f89a4b3ce4a880904a7b93ead.1283782701.git.qy03fugy@stud.informatik.uni-erlangen.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/early-quirks.c')
-rw-r--r--arch/x86/kernel/early-quirks.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index e5cc7e82e60d..e4bd78c160d8 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)
98} 98}
99 99
100#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC) 100#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
101#if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC)
102static u32 __init ati_ixp4x0_rev(int num, int slot, int func) 101static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
103{ 102{
104 u32 d; 103 u32 d;
@@ -116,7 +115,6 @@ static u32 __init ati_ixp4x0_rev(int num, int slot, int func)
116 d &= 0xff; 115 d &= 0xff;
117 return d; 116 return d;
118} 117}
119#endif
120 118
121static void __init ati_bugs(int num, int slot, int func) 119static void __init ati_bugs(int num, int slot, int func)
122{ 120{