This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / pnp / pnpbios / core.c

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index c4220a6..c89cade 100644 (file)
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -56,11 +56,10 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/slab.h>
-#include <linux/kobject_uevent.h>
+#include <linux/kmod.h>
 #include <linux/completion.h>
 #include <linux/spinlock.h>
 #include <linux/dmi.h>
-#include <linux/delay.h>
 
 #include <asm/page.h>
 #include <asm/desc.h>
@@ -178,7 +177,8 @@ static int pnp_dock_thread(void * unused)
                /*
                 * Poll every 2 seconds
                 */
-               msleep_interruptible(2000);
+               set_current_state(TASK_INTERRUPTIBLE);
+               schedule_timeout(HZ*2);
                if(signal_pending(current))
                        break;
 
@@ -538,13 +538,11 @@ 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())
@@ -582,8 +580,6 @@ subsys_initcall(pnpbios_init);
 
 static int __init pnpbios_thread_init(void)
 {
-       if (pnpbios_disabled)
-               return 0;
 #ifdef CONFIG_HOTPLUG
        init_completion(&unload_sem);
        if (kernel_thread(pnp_dock_thread, NULL, CLONE_KERNEL) > 0)