diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /include/asm-x86/xen/hypercall.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'include/asm-x86/xen/hypercall.h')
| -rw-r--r-- | include/asm-x86/xen/hypercall.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index 91cb7fd5c123..44f4259bee3f 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h | |||
| @@ -30,8 +30,8 @@ | |||
| 30 | * IN THE SOFTWARE. | 30 | * IN THE SOFTWARE. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #ifndef __HYPERCALL_H__ | 33 | #ifndef ASM_X86__XEN__HYPERCALL_H |
| 34 | #define __HYPERCALL_H__ | 34 | #define ASM_X86__XEN__HYPERCALL_H |
| 35 | 35 | ||
| 36 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 37 | #include <linux/string.h> | 37 | #include <linux/string.h> |
| @@ -524,4 +524,4 @@ MULTI_stack_switch(struct multicall_entry *mcl, | |||
| 524 | mcl->args[1] = esp; | 524 | mcl->args[1] = esp; |
| 525 | } | 525 | } |
| 526 | 526 | ||
| 527 | #endif /* __HYPERCALL_H__ */ | 527 | #endif /* ASM_X86__XEN__HYPERCALL_H */ |