[PATCH] PnP Fixes for 2.6.10-rc1
From: Adam Belay (ambx1_at_neo.rr.com)
Date: 10/25/04
- Previous message: Adam Belay: "[BK PATCH] PnP Fixes for 2.6.10-rc1"
- Next in thread: Adam Belay: "Re: [PATCH] PnP Fixes for 2.6.10-rc1"
- Reply: Adam Belay: "Re: [PATCH] PnP Fixes for 2.6.10-rc1"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Mon, 25 Oct 2004 00:51:08 -0400 To: linux-kernel@vger.kernel.org
# 2004/10/24 23:07:32-04:00 ambx1@neo.rr.com
# [PNPBIOS] disable if ACPI is active
#
# As further ACPI pnp functionaility is implemented it is no longer
# safe to run ACPI and PNPBIOS concurrently.
#
# We therefore take the following approach:
# - attempt to enable ACPI support
# - if ACPI fails (blacklist etc.) enable pnpbios support
# - if ACPI support is not compiled in the kernel enable pnpbios support
#
# Signed-off-by: Adam Belay <ambx1@neo.rr.com>
diff -Nru a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
--- a/drivers/pnp/pnpbios/core.c 2004-10-25 00:08:19 -04:00
+++ b/drivers/pnp/pnpbios/core.c 2004-10-25 00:08:19 -04:00
@@ -538,6 +538,12 @@
return -ENODEV;
}
+ if (!acpi_disabled) {
+ pnpbios_disabled = 1;
+ printk(KERN_INFO "PnPBIOS: Disabled by ACPI\n");
+ return -ENODEV;
+ }
+
/* scan the system for pnpbios support */
if (!pnpbios_probe_system())
return -ENODEV;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Adam Belay: "[BK PATCH] PnP Fixes for 2.6.10-rc1"
- Next in thread: Adam Belay: "Re: [PATCH] PnP Fixes for 2.6.10-rc1"
- Reply: Adam Belay: "Re: [PATCH] PnP Fixes for 2.6.10-rc1"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
