[ACPI] disable PNPBIOS if ACPI, even without PNPACPI

Signed-off-by: Len Brown <len.brown@intel.com>

[ACPI] disable PNPBIOS if ACPI, even without PNPACPI
Signed-off-by: Len Brown <len.brown@intel.com>
f710ef2d · Len Brown · Len Brown · da88df48 · f710ef2d
Commit f710ef2d authored Nov 04, 2004 by Len Brown Committed by Len Brown Nov 04, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

drivers/pnp/pnpbios/core.c drivers/pnp/pnpbios/core.c +3 -3

No files found.
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -531,11 +531,11 @@ int __init pnpbios_init(void)
 {
 	int ret;

-	/* Don't use pnpbios if pnpacpi is used */
-#ifdef CONFIG_PNPACPI
+	/* Don't use pnpbios if ACPI is enabled */
+#ifdef CONFIG_ACPI
 	if (!acpi_disabled) {
 		pnpbios_disabled = 1;
-		printk(KERN_INFO "PnPBIOS: Disabled by pnpacpi\n");
+		printk(KERN_INFO "PnPBIOS: Disabled by ACPI\n");
 		return -ENODEV;
 	}
 #endif