Message ID | 3186627.pxZj1QbYNg@aspire.rjw.lan |
---|---|
State | Not Applicable |
Headers | show |
Series | x86 / PCI: Make broadcom_postcore_init() check acpi_disabled | expand |
Index: linux-pm/arch/x86/pci/broadcom_bus.c =================================================================== --- linux-pm.orig/arch/x86/pci/broadcom_bus.c +++ linux-pm/arch/x86/pci/broadcom_bus.c @@ -97,7 +97,7 @@ static int __init broadcom_postcore_init * We should get host bridge information from ACPI unless the BIOS * doesn't support it. */ - if (acpi_os_get_root_pointer()) + if (!acpi_disabled && acpi_os_get_root_pointer()) return 0; #endif