summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2004-11-11 06:01:20 -0500
committerLen Brown <len.brown@intel.com>2004-11-11 06:01:20 -0500
commit1e84bf47bb06e1618147ad711a336344da93dd4f (patch)
tree6be157683f971e1e7245a6a87083d02079dbd2c7
parent46755e1fadc6ae19f11f5ba5f2162c597df44749 (diff)
Cset exclude: torvalds@ppc970.osdl.org|ChangeSet|20041111002817|28673
Cset exclude: acme@conectiva.com.br[torvalds]|ChangeSet|20041111002501|29509
-rw-r--r--arch/i386/kernel/io_apic.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 1443c31312a5..11fe9e881254 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -1069,13 +1069,11 @@ static int pin_2_irq(int idx, int apic, int pin)
while (i < apic)
irq += nr_ioapic_registers[i++];
irq += pin;
-#ifdef CONFIG_ACPI_BOOT
/*
* For MPS mode, so far only used by ES7000 platform
*/
if (platform_rename_gsi)
irq = platform_rename_gsi(apic, irq);
-#endif
break;
}
default: