Skip to content

L
linux
Commit f710ef2d authored by Len Brown's avatar Len Brown Committed by Len Brown
Browse files
Options

[ACPI] disable PNPBIOS if ACPI, even without PNPACPI 

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent da88df48
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
drivers/pnp/pnpbios/core.c
View file @ f710ef2d
...@@ -531,11 +531,11 @@ int __init pnpbios_init(void) ...@@ -531,11 +531,11 @@ int __init pnpbios_init(void)
{ {
int ret; int ret;
/* Don't use pnpbios if pnpacpi is used */ /* Don't use pnpbios if ACPI is enabled */
#ifdef CONFIG_PNPACPI #ifdef CONFIG_ACPI
if (!acpi_disabled) { if (!acpi_disabled) {
pnpbios_disabled = 1; pnpbios_disabled = 1;
printk(KERN_INFO "PnPBIOS: Disabled by pnpacpi\n"); printk(KERN_INFO "PnPBIOS: Disabled by ACPI\n");
return -ENODEV; return -ENODEV;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7