# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/03/21 21:34:35-05:00 len.brown@intel.com 
#   [ACPI] fix interrupts behind yenta cardbus bridge (David Shaohua Li)
#   http://bugzilla.kernel.org/show_bug.cgi?id=1564
# 
# drivers/acpi/pci_irq.c
#   2004/03/21 21:32:47-05:00 len.brown@intel.com +13 -1
#   fix interrupts for dev behind cardbus bridge (David Shaohua Li)
#   http://bugzilla.kernel.org/show_bug.cgi?id=1564
# 
diff -Nru a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
--- a/drivers/acpi/pci_irq.c	Sun Mar 21 21:34:41 2004
+++ b/drivers/acpi/pci_irq.c	Sun Mar 21 21:34:41 2004
@@ -273,6 +273,10 @@
 	return_VALUE(entry->irq);
 }
 
+/*
+ * current thinking is that acpi_pci_irq_derive() adds no value
+ * and should be deleted, so warn if it actually does something.
+ */
 
 static int
 acpi_pci_irq_derive (
@@ -303,7 +307,8 @@
 		return_VALUE(0);
 	}
 
-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Derived IRQ %d\n", irq));
+	ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Derive IRQ %d for device %s from %s\n",
+		irq, pci_name(dev), pci_name(bridge)));
 
 	return_VALUE(irq);
 }
@@ -338,6 +343,13 @@
 	 * values override any BIOS-assigned IRQs set during boot.
 	 */
  	irq = acpi_pci_irq_lookup(dev->bus, PCI_SLOT(dev->devfn), pin);
+
+	/*
+	 * Check if the device has an IRQ,
+	 * Hotplug devices may get IRQs by scanning
+	 */
+	if (!irq && dev->irq)
+		irq = dev->irq;
  
 	/*
 	 * If no PRT entry was found, we'll try to derive an IRQ from the