[ACPI] disable PNPBIOS if ACPI, even without PNPACPI

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

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 896c8f2f553abba428e889be8c0891ab2575e5d7..da61b1c0527e041dd0f2812a70bb2f0226beb346 100644 (file)
--- 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