From baa79ea55237f7400afff6b337192f56093b67b4 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 3 Feb 2013 09:58:37 +0000
Subject: [PATCH] --- yaml --- r: 360083 b: refs/heads/master c:
 617fed41e98417f3ea3e9974be251e125c8796f2 h: refs/heads/master i:   360081:
 4d33b63735e94aa986d5e840165cb9beea89e781   360079:
 980930fcf3c70612bd367c10acfb63e7040a921f v: v3

---
 [refs]                      | 2 +-
 trunk/arch/mips/ath79/pci.c | 4 +++-
 trunk/arch/mips/ath79/pci.h | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 42e042bcc8c5..929b9c1a179e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b6dcba427d70e61667c28b45e3f090ff00acb1
+refs/heads/master: 617fed41e98417f3ea3e9974be251e125c8796f2
diff --git a/trunk/arch/mips/ath79/pci.c b/trunk/arch/mips/ath79/pci.c
index c94bcec169ab..d90e07136383 100644
--- a/trunk/arch/mips/ath79/pci.c
+++ b/trunk/arch/mips/ath79/pci.c
@@ -75,7 +75,9 @@ int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
 		const struct ath79_pci_irq *entry;
 
 		entry = &ath79_pci_irq_map[i];
-		if (entry->slot == slot && entry->pin == pin) {
+		if (entry->bus == dev->bus->number &&
+		    entry->slot == slot &&
+		    entry->pin == pin) {
 			irq = entry->irq;
 			break;
 		}
diff --git a/trunk/arch/mips/ath79/pci.h b/trunk/arch/mips/ath79/pci.h
index 51c6625dcc6d..1d00a3803c37 100644
--- a/trunk/arch/mips/ath79/pci.h
+++ b/trunk/arch/mips/ath79/pci.h
@@ -14,6 +14,7 @@
 #define _ATH79_PCI_H
 
 struct ath79_pci_irq {
+	int	bus;
 	u8	slot;
 	u8	pin;
 	int	irq;