Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[karo-tx-linux.git] / drivers / acpi / proc.c

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index ef98796b3824fd0895b5e27a5d6b2d1c14949b49..52ce76725c2024bfea9bc20602ea239c0bc011ff 100644 (file)
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -311,11 +311,12 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                           dev->pnp.bus_id,
                           (u32) dev->wakeup.sleep_state);
 
-               if (!dev->physical_node_count)
+               if (!dev->physical_node_count) {
                        seq_printf(seq, "%c%-8s\n",
-                               dev->wakeup.flags.run_wake ?
-                               '*' : ' ', "disabled");
-               else {
+                               dev->wakeup.flags.run_wake ? '*' : ' ',
+                               device_may_wakeup(&dev->dev) ?
+                                       "enabled" : "disabled");
+               } else {
                        struct device *ldev;
                        list_for_each_entry(entry, &dev->physical_node_list,
                                        node) {