From e910c7de954a9d8185419f206aff6a68029c04f8 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu, 6 Jan 2011 10:12:24 -0700
Subject: [PATCH] --- yaml --- r: 231077 b: refs/heads/master c:
 30e664afb5cb597dd6f7651e6d116e10b9741084 h: refs/heads/master i:   231075:
 2b65df66b04b58301ce68ad9d069951036a85afc v: v3

---
 [refs]                            |  2 +-
 trunk/arch/x86/pci/broadcom_bus.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f7a5ddc8bb13..dd762377f93d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 415e12b2379239973feab91850b0dce985c6058a
+refs/heads/master: 30e664afb5cb597dd6f7651e6d116e10b9741084
diff --git a/trunk/arch/x86/pci/broadcom_bus.c b/trunk/arch/x86/pci/broadcom_bus.c
index 0846a5bbbfbd..ab8269b0da29 100644
--- a/trunk/arch/x86/pci/broadcom_bus.c
+++ b/trunk/arch/x86/pci/broadcom_bus.c
@@ -9,6 +9,7 @@
  * option) any later version.
  */
 
+#include <linux/acpi.h>
 #include <linux/delay.h>
 #include <linux/dmi.h>
 #include <linux/pci.h>
@@ -25,12 +26,14 @@ static void __devinit cnb20le_res(struct pci_dev *dev)
 	u8 fbus, lbus;
 	int i;
 
+#ifdef CONFIG_ACPI
 	/*
-	 * The x86_pci_root_bus_res_quirks() function already refuses to use
-	 * this information if ACPI _CRS was used. Therefore, we don't bother
-	 * checking if ACPI is enabled, and just generate the information
-	 * for both the ACPI _CRS and no ACPI cases.
+	 * We should get host bridge information from ACPI unless the BIOS
+	 * doesn't support it.
 	 */
+	if (acpi_os_get_root_pointer())
+		return;
+#endif
 
 	info = &pci_root_info[pci_root_num];
 	pci_root_num++;