Merge branch 'pm-domains' into pm-for-linus

* pm-domains:
  ARM: mach-shmobile: sh7372 A4R support (v4)
  ARM: mach-shmobile: sh7372 A3SP support (v4)
  PM / Sleep: Mark devices involved in wakeup signaling during suspend
This commit is contained in:
Rafael J. Wysocki 2011-10-22 00:21:52 +02:00
commit d033e07856
9 changed files with 159 additions and 9 deletions

View file

@ -452,6 +452,7 @@ struct dev_pm_info {
struct list_head entry;
struct completion completion;
struct wakeup_source *wakeup;
bool wakeup_path:1;
#else
unsigned int should_wakeup:1;
#endif