diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 18:37:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 18:37:42 -0700 |
| commit | 804f18536984939622ddca60ab6b25743e0ec68d (patch) | |
| tree | 82d96cd5f49876970afdd78b891875fd4c6df344 /drivers/xen/xenbus/xenbus_probe.h | |
| 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 'drivers/xen/xenbus/xenbus_probe.h')
| -rw-r--r-- | drivers/xen/xenbus/xenbus_probe.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.h b/drivers/xen/xenbus/xenbus_probe.h index 24665812316..888b9900ca0 100644 --- a/drivers/xen/xenbus/xenbus_probe.h +++ b/drivers/xen/xenbus/xenbus_probe.h @@ -64,8 +64,9 @@ extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus); extern void xenbus_dev_shutdown(struct device *_dev); -extern int xenbus_dev_suspend(struct device *dev, pm_message_t state); +extern int xenbus_dev_suspend(struct device *dev); extern int xenbus_dev_resume(struct device *dev); +extern int xenbus_dev_cancel(struct device *dev); extern void xenbus_otherend_changed(struct xenbus_watch *watch, const char **vec, unsigned int len, |