diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 06:56:10 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 06:56:10 +0300 |
| commit | 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch) | |
| tree | ba0299694a9f3940f289b6a29cadab853906e3d2 /include/xen/privcmd.h | |
| parent | 623eb15647fc35c5a8cd38985d5958240eb072c1 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
| download | linux-7ccbefe07ea0a3570e44d1ec13a307552ee4dadd.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/xen/privcmd.h')
| -rw-r--r-- | include/xen/privcmd.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/xen/privcmd.h b/include/xen/privcmd.h index b42cdfd92fee..17857fb4d550 100644 --- a/include/xen/privcmd.h +++ b/include/xen/privcmd.h @@ -34,13 +34,10 @@ #define __LINUX_PUBLIC_PRIVCMD_H__ #include <linux/types.h> +#include <linux/compiler.h> typedef unsigned long xen_pfn_t; -#ifndef __user -#define __user -#endif - struct privcmd_hypercall { __u64 op; __u64 arg[5]; |