diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 00:45:28 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 00:45:28 -0400 |
| commit | 77c7ee51a062bb595c501ec098125a68999c20c3 (patch) | |
| tree | c5060ca5786ef353e005dae04b61d2c49967284d /arch/x86/xen/trace.c | |
| parent | 1ba762209491e2496e58baffa3fd65d661f54404 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
drivers/tty/serial/sh-sci.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/x86/xen/trace.c')
| -rw-r--r-- | arch/x86/xen/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/trace.c b/arch/x86/xen/trace.c index 734beba2a08c..520022d1a181 100644 --- a/arch/x86/xen/trace.c +++ b/arch/x86/xen/trace.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/ftrace.h> | 1 | #include <linux/ftrace.h> |
| 2 | #include <xen/interface/xen.h> | ||
| 2 | 3 | ||
| 3 | #define N(x) [__HYPERVISOR_##x] = "("#x")" | 4 | #define N(x) [__HYPERVISOR_##x] = "("#x")" |
| 4 | static const char *xen_hypercall_names[] = { | 5 | static const char *xen_hypercall_names[] = { |