Merge branch 'acpi-pm'

* acpi-pm:
  PM / core: Drop run_wake flag from struct dev_pm_info
  PCI / PM: Simplify device wakeup settings code
  PCI / PM: Drop pme_interrupt flag from struct pci_dev
  ACPI / PM: Consolidate device wakeup settings code
  ACPI / PM: Drop run_wake from struct acpi_device_wakeup_flags
  ACPI / sleep: EC-based wakeup from suspend-to-idle on recent systems
  platform: x86: intel-hid: Wake up the system from suspend-to-idle
  platform: x86: intel-vbtn: Wake up the system from suspend-to-idle
  ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle
  platform/x86: Add driver for ACPI INT0002 Virtual GPIO device
  PCI / PM: Restore PME Enable if skipping wakeup setup
  PM / sleep: Print timing information if debug is enabled
  ACPI / PM: Clean up device wakeup enable/disable code
  ACPI / PM: Change log level of wakeup-related message
  USB / PCI / PM: Allow the PCI core to do the resume cleanup
  ACPI / PM: Run wakeup notify handlers synchronously

Conflicts:
	drivers/base/power/main.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index a34669cc823b..85ac848ac6ab 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -42,7 +42,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 
                 if (!dev->physical_node_count) {
                         seq_printf(seq, "%c%-8s\n",
-                                dev->wakeup.flags.run_wake ? '*' : ' ',
+                                dev->wakeup.flags.valid ? '*' : ' ',
                                 device_may_wakeup(&dev->dev) ?
                                         "enabled" : "disabled");
                 } else {
@@ -58,7 +58,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                                         seq_printf(seq, "\t\t");
 
                                 seq_printf(seq, "%c%-8s  %s:%s\n",
-                                        dev->wakeup.flags.run_wake ? '*' : ' ',
+                                        dev->wakeup.flags.valid ? '*' : ' ',
                                         (device_may_wakeup(&dev->dev) ||
                                         device_may_wakeup(ldev)) ?
                                         "enabled" : "disabled",