From 513d381b8142f742de3884f8f38485dcbfc57f69 Mon Sep 17 00:00:00 2001
From: Andreas Fleig <andreasfleig@gmail.com>
Date: Sun, 27 Jan 2013 14:17:55 +0000
Subject: [PATCH] --- yaml --- r: 350943 b: refs/heads/master c:
 65ab96f60621c4da8f1b4087a57b788bc4d8f27b h: refs/heads/master i:   350941:
 6aa0ab6c805785b12a2931d6aaba0b2889cde654   350939:
 80119ce90a223f212e99d25e63c577075a043f0a   350935:
 298c04cab8a183c76802065441debd318834a1f6   350927:
 06f81bc0ea36c14a54470716ed9f3b36bf9c79f8   350911:
 d81a1fafaca3a645480542978cd8804e58cea018 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/proc.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ca69ddfb8a2f..554dd3661d10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 660b1113e0f33a476952cb2cbcb5c9831e7ff4cd
+refs/heads/master: 65ab96f60621c4da8f1b4087a57b788bc4d8f27b
diff --git a/trunk/drivers/acpi/proc.c b/trunk/drivers/acpi/proc.c
index ef98796b3824..52ce76725c20 100644
--- a/trunk/drivers/acpi/proc.c
+++ b/trunk/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) {