diff options
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 1dac94265b59..bcdace45b000 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -907,10 +907,6 @@ static int __init acpi_parse_madt_lapic_entries(void) | |||
907 | #ifdef CONFIG_X86_IO_APIC | 907 | #ifdef CONFIG_X86_IO_APIC |
908 | #define MP_ISA_BUS 0 | 908 | #define MP_ISA_BUS 0 |
909 | 909 | ||
910 | #ifdef CONFIG_X86_ES7000 | ||
911 | extern int es7000_plat; | ||
912 | #endif | ||
913 | |||
914 | void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) | 910 | void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) |
915 | { | 911 | { |
916 | int ioapic; | 912 | int ioapic; |
@@ -960,14 +956,6 @@ void __init mp_config_acpi_legacy_irqs(void) | |||
960 | set_bit(MP_ISA_BUS, mp_bus_not_pci); | 956 | set_bit(MP_ISA_BUS, mp_bus_not_pci); |
961 | pr_debug("Bus #%d is ISA\n", MP_ISA_BUS); | 957 | pr_debug("Bus #%d is ISA\n", MP_ISA_BUS); |
962 | 958 | ||
963 | #ifdef CONFIG_X86_ES7000 | ||
964 | /* | ||
965 | * Older generations of ES7000 have no legacy identity mappings | ||
966 | */ | ||
967 | if (es7000_plat == 1) | ||
968 | return; | ||
969 | #endif | ||
970 | |||
971 | /* | 959 | /* |
972 | * Use the default configuration for the IRQs 0-15. Unless | 960 | * Use the default configuration for the IRQs 0-15. Unless |
973 | * overridden by (MADT) interrupt source override entries. | 961 | * overridden by (MADT) interrupt source override entries. |