From 8e4bb2018f3e2894eb624661bf0db963373f11cf Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Thu, 20 Mar 2008 14:54:24 +0300
Subject: [PATCH] --- yaml --- r: 88771 b: refs/heads/master c:
 73b2961bfa003518bb9cdd3c4003fad4d474ec13 h: refs/heads/master i:   88769:
 b07eed7d3812bf0fa00a6cf423a4d606b0b0759e   88767:
 904af2fdd01b897fb7bc08815f37fc0b94f1fd23 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/io_apic_32.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 555a43a750a4..f40c6d42c40c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d27e2b8e2ac34b62aca95d3cd7efe9708b718fde
+refs/heads/master: 73b2961bfa003518bb9cdd3c4003fad4d474ec13
diff --git a/trunk/arch/x86/kernel/io_apic_32.c b/trunk/arch/x86/kernel/io_apic_32.c
index b5680780fa95..f7f3f3144fda 100644
--- a/trunk/arch/x86/kernel/io_apic_32.c
+++ b/trunk/arch/x86/kernel/io_apic_32.c
@@ -826,10 +826,7 @@ static int __init find_isa_irq_apic(int irq, int type)
 	for (i = 0; i < mp_irq_entries; i++) {
 		int lbus = mp_irqs[i].mpc_srcbus;
 
-		if ((mp_bus_id_to_type[lbus] == MP_BUS_ISA ||
-		     mp_bus_id_to_type[lbus] == MP_BUS_EISA ||
-		     mp_bus_id_to_type[lbus] == MP_BUS_MCA
-		    ) &&
+		if (test_bit(lbus, mp_bus_not_pci) &&
 		    (mp_irqs[i].mpc_irqtype == type) &&
 		    (mp_irqs[i].mpc_srcbusirq == irq))
 			break;