diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-22 21:47:29 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-22 21:47:29 -0700 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/xen/xenbus.h | |
| parent | Input: sh_keysc - allow modifying keymap from userspace (diff) | |
| parent | Linux 2.6.31-rc4 (diff) | |
| download | linux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.tar.xz linux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.zip | |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/xen/xenbus.h')
| -rw-r--r-- | include/xen/xenbus.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index f87f9614844d..b9763badbd77 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -91,8 +91,7 @@ struct xenbus_driver { void (*otherend_changed)(struct xenbus_device *dev, enum xenbus_state backend_state); int (*remove)(struct xenbus_device *dev); - int (*suspend)(struct xenbus_device *dev); - int (*suspend_cancel)(struct xenbus_device *dev); + int (*suspend)(struct xenbus_device *dev, pm_message_t state); int (*resume)(struct xenbus_device *dev); int (*uevent)(struct xenbus_device *, char **, int, char *, int); struct device_driver driver; |