diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-25 13:38:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-25 13:38:52 -0400 |
| commit | 7d7a48b76012eeee25871e1d69104dec4b6d740f (patch) | |
| tree | c27e3d8bb2e80ad93c7b4a5c850e1ffbc090bcd2 /arch/x86/kernel/early-quirks.c | |
| parent | e4072a9a9d186fe86293effe8828faa4be75b4a4 (diff) | |
| parent | 229aebb873e29726b91e076161649cf45154b0bf (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We want to queue up a dependent fix.
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.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 ebdb85cf2686..76b8cd953dee 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c | |||
| @@ -97,7 +97,6 @@ static void __init nvidia_bugs(int num, int slot, int func) | |||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | #if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC) | 99 | #if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC) |
| 100 | #if defined(CONFIG_ACPI) && defined(CONFIG_X86_IO_APIC) | ||
| 101 | static u32 __init ati_ixp4x0_rev(int num, int slot, int func) | 100 | static u32 __init ati_ixp4x0_rev(int num, int slot, int func) |
| 102 | { | 101 | { |
| 103 | u32 d; | 102 | u32 d; |
| @@ -115,7 +114,6 @@ static u32 __init ati_ixp4x0_rev(int num, int slot, int func) | |||
| 115 | d &= 0xff; | 114 | d &= 0xff; |
| 116 | return d; | 115 | return d; |
| 117 | } | 116 | } |
| 118 | #endif | ||
| 119 | 117 | ||
| 120 | static void __init ati_bugs(int num, int slot, int func) | 118 | static void __init ati_bugs(int num, int slot, int func) |
| 121 | { | 119 | { |