diff options
| author | Greg Kroah-Hartman | 2015-05-18 23:08:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-05-18 23:08:58 +0200 |
| commit | 02730d3c053a9af1d402e1c8dc8bbbc5a1340406 (patch) | |
| tree | db289a08de50eb4b5caf7840d5b7356ddfa1c51f /include/xen/xen-ops.h | |
| parent | vt: Don't check KD_GRAPHICS when binding/unbinding (diff) | |
| parent | Linux 4.1-rc4 (diff) | |
| download | kernel-qcow2-linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.gz kernel-qcow2-linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.xz kernel-qcow2-linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.zip | |
Merge 4.1-rc4 into tty-next
This resolves some tty driver merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/xen/xen-ops.h')
| -rw-r--r-- | include/xen/xen-ops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index c643e6a94c9a..0ce4f32017ea 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -13,6 +13,7 @@ void xen_arch_post_suspend(int suspend_cancelled); void xen_timer_resume(void); void xen_arch_resume(void); +void xen_arch_suspend(void); void xen_resume_notifier_register(struct notifier_block *nb); void xen_resume_notifier_unregister(struct notifier_block *nb); |