[PATCH] PnP Fixes for 2.6.10-rc1

[Adam Belay <ambx1@neo.rr.com>]

#   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;