---

yaml --- r: 28591 b: refs/heads/master c: c0da3ba h: refs/heads/master i: 28589: 9999778 28587: d83f1b9 28583: b87602d 28575: f4422a4 v: v3
git-mirror · Jun 21, 2006 · 8889708 · 8889708
1 parent 0a4ae26
commit 8889708
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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);