summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-08 21:20:11 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2016-01-08 21:20:11 -0500
commit6108209c4ae964836f6bac5210f1c64153800b62 (patch)
tree83651902b46af6bbf8d2ea4841b397bac306095b /arch/x86
parenta1c6f05733c27ba7067c06c095f49e8732a5ae17 (diff)
parenta7f61e89af73e9bf760826b20dba4e637221fcb9 (diff)
downloadlinux-6108209c4ae964836f6bac5210f1c64153800b62.tar.bz2
Merge branch 'for-linus' into work.misc
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/suspend.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 3705eabd7e22..df0c40559583 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -1,6 +1,7 @@
#include <linux/types.h>
#include <linux/tick.h>
+#include <xen/xen.h>
#include <xen/interface/xen.h>
#include <xen/grant_table.h>
#include <xen/events.h>