diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 21:37:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 21:37:42 -0400 |
| commit | 804f18536984939622ddca60ab6b25743e0ec68d (patch) | |
| tree | 82d96cd5f49876970afdd78b891875fd4c6df344 /include/xen | |
| parent | 5a39837f76b7ded29afdf6ed2c2d5e56107179b7 (diff) | |
| parent | b3e96c0c756211e805c6941d4a6e5f6e1995cb6b (diff) | |
Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: use freeze/restore/thaw PM events for suspend/resume/chkpt
xen: xenbus PM events support
Diffstat (limited to 'include/xen')
| -rw-r--r-- | include/xen/xenbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 7a1d15ff19b7..5467369e0889 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h | |||
| @@ -92,7 +92,7 @@ struct xenbus_driver { | |||
| 92 | void (*otherend_changed)(struct xenbus_device *dev, | 92 | void (*otherend_changed)(struct xenbus_device *dev, |
| 93 | enum xenbus_state backend_state); | 93 | enum xenbus_state backend_state); |
| 94 | int (*remove)(struct xenbus_device *dev); | 94 | int (*remove)(struct xenbus_device *dev); |
| 95 | int (*suspend)(struct xenbus_device *dev, pm_message_t state); | 95 | int (*suspend)(struct xenbus_device *dev); |
| 96 | int (*resume)(struct xenbus_device *dev); | 96 | int (*resume)(struct xenbus_device *dev); |
| 97 | int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *); | 97 | int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *); |
| 98 | struct device_driver driver; | 98 | struct device_driver driver; |