aboutsummaryrefslogtreecommitdiffstats
path: root/include/xen/interface/sched.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-11 10:55:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-10-11 10:55:04 +0100
commita0f0dd57f4a85310d9936f1770a0424b49fef876 (patch)
tree2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b /include/xen/interface/sched.h
parentARM: 7549/1: HYP: fix boot on some ARM1136 cores (diff)
parentARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels (diff)
downloadlinux-dev-a0f0dd57f4a85310d9936f1770a0424b49fef876.tar.xz
linux-dev-a0f0dd57f4a85310d9936f1770a0424b49fef876.zip
Merge branch 'fixes' into for-linus
Conflicts: arch/arm/kernel/smp.c
Diffstat (limited to 'include/xen/interface/sched.h')
-rw-r--r--include/xen/interface/sched.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/interface/sched.h b/include/xen/interface/sched.h
index dd55dac340de..9ce083960a25 100644
--- a/include/xen/interface/sched.h
+++ b/include/xen/interface/sched.h
@@ -9,7 +9,7 @@
#ifndef __XEN_PUBLIC_SCHED_H__
#define __XEN_PUBLIC_SCHED_H__
-#include "event_channel.h"
+#include <xen/interface/event_channel.h>
/*
* The prototype for this hypercall is: