diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-26 22:37:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-26 22:37:05 -0800 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /include/xen/privcmd.h | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
| download | kernel_samsung_smdk4412-17f7f4d9fcce8f1b75b5f735569309dee7665968.zip kernel_samsung_smdk4412-17f7f4d9fcce8f1b75b5f735569309dee7665968.tar.gz kernel_samsung_smdk4412-17f7f4d9fcce8f1b75b5f735569309dee7665968.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
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 b42cdfd..17857fb 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]; |