1 files changed, 3 insertions, 14 deletions

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index e88300d8e80a..675e9045a3c5 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -142,7 +142,7 @@ int mp_irq_entries;
 /* GSI interrupts */
 static int nr_irqs_gsi = NR_IRQS_LEGACY;
 
-#if defined (CONFIG_MCA) || defined (CONFIG_EISA)
+#ifdef CONFIG_EISA
 int mp_bus_id_to_type[MAX_MP_BUSSES];
 #endif
 
@@ -875,7 +875,7 @@ static int __init find_isa_irq_apic(int irq, int type)
         return -1;
 }
 
-#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
+#ifdef CONFIG_EISA
 /*
  * EISA Edge/Level control register, ELCR
  */
@@ -912,12 +912,6 @@ static int EISA_ELCR(unsigned int irq)
 #define default_PCI_trigger(idx)        (1)
 #define default_PCI_polarity(idx)       (1)
 
-/* MCA interrupts are always polarity zero level triggered,
- * when listed as conforming in the MP table. */
-
-#define default_MCA_trigger(idx)        (1)
-#define default_MCA_polarity(idx)       default_ISA_polarity(idx)
-
 static int irq_polarity(int idx)
 {
         int bus = mp_irqs[idx].srcbus;
@@ -975,7 +969,7 @@ static int irq_trigger(int idx)
                                 trigger = default_ISA_trigger(idx);
                         else
                                 trigger = default_PCI_trigger(idx);
-#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
+#ifdef CONFIG_EISA
                         switch (mp_bus_id_to_type[bus]) {
                                 case MP_BUS_ISA: /* ISA pin */
                                 {
@@ -992,11 +986,6 @@ static int irq_trigger(int idx)
                                         /* set before the switch */
                                         break;
                                 }
-                                case MP_BUS_MCA: /* MCA pin */
-                                {
-                                        trigger = default_MCA_trigger(idx);
-                                        break;
-                                }
                                 default:
                                 {
                                         printk(KERN_WARNING "broken BIOS!!\n");