diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2018-01-24 17:12:03 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-03-08 14:54:44 +0100 |
commit | 6c5a561f09a61ca507ce26f04790197f552ccf9a (patch) | |
tree | 14690eb1c2973634e221dc317350462128bf4b0b /arch/x86/pci/broadcom_bus.c | |
parent | fcfdb9c32075501e64751cc6a79fd91d15933692 (diff) | |
parent | 2e4575e9ced4a5ac27cf4010c2e975c271b155f7 (diff) |
Merge remote-tracking branch 'linux-fslc/4.9-1.0.x-imx' into toradex_4.9-1.0.x-imx-next
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'arch/x86/pci/broadcom_bus.c')
-rw-r--r-- | arch/x86/pci/broadcom_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c index bb461cfd01ab..526536c81ddc 100644 --- a/arch/x86/pci/broadcom_bus.c +++ b/arch/x86/pci/broadcom_bus.c @@ -97,7 +97,7 @@ static int __init broadcom_postcore_init(void) * 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 |