Merge bk://linux-pnp.bkbits.net/pnp-stable

into ppc970.osdl.org:/home/torvalds/v2.6/linux

drivers/pnp/pnpbios/core.c

@@ -60,6 +60,7 @@
 #include <linux/completion.h>
 #include <linux/spinlock.h>
 #include <linux/dmi.h>
+#include <linux/delay.h>
 
 #include <asm/page.h>
 #include <asm/desc.h>
@@ -177,8 +178,7 @@ static int pnp_dock_thread(void * unused)
 		/*
 		 * Poll every 2 seconds
 		 */
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(HZ*2);
+		msleep_interruptible(2000);
 		if(signal_pending(current))
 			break;
 
@@ -538,6 +538,14 @@ int __init pnpbios_init(void)
 		return -ENODEV;
 	}
 
+#ifdef CONFIG_ACPI
+	if (!acpi_disabled) {
+		pnpbios_disabled = 1;
+		printk(KERN_INFO "PnPBIOS: Disabled by ACPI\n");
+		return -ENODEV;
+	}
+#endif /* CONFIG_ACPI */
+
 	/* scan the system for pnpbios support */
 	if (!pnpbios_probe_system())
 		return -ENODEV;