From 88897084a2b89fb5b2662c843b95ba75d20e9e73 Mon Sep 17 00:00:00 2001
From: Kimball Murray <kimball.murray@gmail.com>
Date: Wed, 31 May 2006 14:20:04 -0400
Subject: [PATCH] --- yaml --- r: 28591 b: refs/heads/master c:
 c0da3ba0a29d70c95ed39366a1c9b849f3439fbe h: refs/heads/master i:   28589:
 9999778147ff18ff79bc05b5c7d38c169ea4cb7a   28587:
 d83f1b93b4b009619e4f4ee8db64ba0c65ff7570   28583:
 b87602d213dc665363db83344b1bc478a7a19348   28575:
 f4422a4b8901753f0aef179cd3fb76eb814a8570 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/setup-bus.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 420685860973..b4d49d8d0f9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b209a6ee49099b7500abf024f7b6b9648b5a3eac
+refs/heads/master: c0da3ba0a29d70c95ed39366a1c9b849f3439fbe
diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c
index 28ce3a7ee434..35086e80faa9 100644
--- a/trunk/drivers/pci/setup-bus.c
+++ b/trunk/drivers/pci/setup-bus.c
@@ -55,9 +55,10 @@ pbus_assign_resources_sorted(struct pci_bus *bus)
 	list_for_each_entry(dev, &bus->devices, bus_list) {
 		u16 class = dev->class >> 8;
 
-		/* Don't touch classless devices and host bridges.  */
+		/* Don't touch classless devices or host bridges or ioapics.  */
 		if (class == PCI_CLASS_NOT_DEFINED ||
-		    class == PCI_CLASS_BRIDGE_HOST)
+		    class == PCI_CLASS_BRIDGE_HOST ||
+		    class == PCI_CLASS_SYSTEM_PIC)
 			continue;
 
 		pdev_sort_resources(dev, &head);