diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
| commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
| tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /arch/x86 | |
| parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
| parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 8d676d8ecde..9830681446a 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -113,7 +113,6 @@ static inline void acpi_disable_pci(void) acpi_pci_disabled = 1; acpi_noirq_set(); } -extern int acpi_irq_balance_set(char *str); /* routines for saving/restoring kernel state */ extern int acpi_save_state_mem(void); diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 8c1f76abae9..4c51a2f8fd3 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1343,7 +1343,6 @@ static void __init acpi_process_madt(void) error = acpi_parse_madt_ioapic_entries(); if (!error) { acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC; - acpi_irq_balance_set(NULL); acpi_ioapic = 1; smp_found_config = 1; |