Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / acpi / sleep / wakeup.c

diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index 85df0ceda2a901277f49108b3cd292c8b980ce8e..97c27ddb144ddced0025b646825ab06bdac60287 100644 (file)
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -17,7 +17,6 @@ ACPI_MODULE_NAME("wakeup_devices")
 extern struct list_head acpi_wakeup_device_list;
 extern spinlock_t acpi_device_lock;
 
-#ifdef CONFIG_ACPI_SLEEP
 /**
  * acpi_enable_wakeup_device_prep - prepare wakeup devices
  *     @sleep_state:   ACPI state
@@ -155,7 +154,6 @@ static int __init acpi_wakeup_device_init(void)
 
        if (acpi_disabled)
                return 0;
-       printk("ACPI wakeup devices: \n");
 
        spin_lock(&acpi_device_lock);
        list_for_each_safe(node, next, &acpi_wakeup_device_list) {
@@ -174,23 +172,20 @@ static int __init acpi_wakeup_device_init(void)
                        dev->wakeup.state.enabled = 1;
                        spin_lock(&acpi_device_lock);
                }
-               printk("%4s ", dev->pnp.bus_id);
        }
        spin_unlock(&acpi_device_lock);
-       printk("\n");
 
        return 0;
 }
 
 late_initcall(acpi_wakeup_device_init);
-#endif
 
 /*
- * Disable all wakeup GPEs before power off.
- * 
+ * Disable all wakeup GPEs before entering requested sleep state.
+ *     @sleep_state:   ACPI state
  * Since acpi_enter_sleep_state() will disable all
  * RUNTIME GPEs, we simply mark all GPES that
- * are not enabled for wakeup from S5 as RUNTIME.
+ * are not enabled for wakeup from requested state as RUNTIME.
  */
 void acpi_gpe_sleep_prepare(u32 sleep_state)
 {