diff options
Diffstat (limited to 'arch/x86/kernel/io_apic_32.c')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 97ac6104d63a..0d70acd3b134 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -915,6 +915,7 @@ void __init setup_ioapic_dest(void) | |||
915 | } | 915 | } |
916 | #endif | 916 | #endif |
917 | 917 | ||
918 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) | ||
918 | /* | 919 | /* |
919 | * EISA Edge/Level control register, ELCR | 920 | * EISA Edge/Level control register, ELCR |
920 | */ | 921 | */ |
@@ -928,6 +929,7 @@ static int EISA_ELCR(unsigned int irq) | |||
928 | "Broken MPtable reports ISA irq %d\n", irq); | 929 | "Broken MPtable reports ISA irq %d\n", irq); |
929 | return 0; | 930 | return 0; |
930 | } | 931 | } |
932 | #endif | ||
931 | 933 | ||
932 | /* ISA interrupts are always polarity zero edge triggered, | 934 | /* ISA interrupts are always polarity zero edge triggered, |
933 | * when listed as conforming in the MP table. */ | 935 | * when listed as conforming in the MP table. */ |
@@ -1013,6 +1015,7 @@ static int MPBIOS_trigger(int idx) | |||
1013 | trigger = test_bit(bus, mp_bus_not_pci)? | 1015 | trigger = test_bit(bus, mp_bus_not_pci)? |
1014 | default_ISA_trigger(idx): | 1016 | default_ISA_trigger(idx): |
1015 | default_PCI_trigger(idx); | 1017 | default_PCI_trigger(idx); |
1018 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) | ||
1016 | switch (mp_bus_id_to_type[bus]) | 1019 | switch (mp_bus_id_to_type[bus]) |
1017 | { | 1020 | { |
1018 | case MP_BUS_ISA: /* ISA pin */ | 1021 | case MP_BUS_ISA: /* ISA pin */ |
@@ -1042,6 +1045,7 @@ static int MPBIOS_trigger(int idx) | |||
1042 | break; | 1045 | break; |
1043 | } | 1046 | } |
1044 | } | 1047 | } |
1048 | #endif | ||
1045 | break; | 1049 | break; |
1046 | } | 1050 | } |
1047 | case 1: /* edge */ | 1051 | case 1: /* edge */ |