diff --git a/[refs] b/[refs]
index f6da70a21dff..0e61fcc475b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0747aaf42d78d26684c6f6b34a4103ff81f571f8
+refs/heads/master: d18690af626b83fef1d1953b9f70e09497060586
diff --git a/trunk/include/linux/pci-acpi.h b/trunk/include/linux/pci-acpi.h
index 3cee2367459f..092e82e0048c 100644
--- a/trunk/include/linux/pci-acpi.h
+++ b/trunk/include/linux/pci-acpi.h
@@ -13,12 +13,12 @@
 #ifdef CONFIG_ACPI
 static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
 {
-	/* Find root host bridge */
-	while (pdev->bus->self)
-		pdev = pdev->bus->self;
-
-	return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus),
-			pdev->bus->number);
+	struct pci_bus *pbus = pdev->bus;
+	/* Find a PCI root bus */
+	while (pbus->parent)
+		pbus = pbus->parent;
+	return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
+					      pbus->number);
 }
 
 static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)