diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:28:36 -0400 |
| commit | 29308333fbe2cc61258c1c470f9403960428beb2 (patch) | |
| tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/vm86.h | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/vm86.h')
| -rw-r--r-- | include/asm-x86/vm86.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/vm86.h b/include/asm-x86/vm86.h index 5ce351325e01..998bd18eb737 100644 --- a/include/asm-x86/vm86.h +++ b/include/asm-x86/vm86.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _LINUX_VM86_H | 1 | #ifndef ASM_X86__VM86_H |
| 2 | #define _LINUX_VM86_H | 2 | #define ASM_X86__VM86_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * I'm guessing at the VIF/VIP flag usage, but hope that this is how | 5 | * I'm guessing at the VIF/VIP flag usage, but hope that this is how |
| @@ -205,4 +205,4 @@ static inline int handle_vm86_trap(struct kernel_vm86_regs *a, long b, int c) | |||
| 205 | 205 | ||
| 206 | #endif /* __KERNEL__ */ | 206 | #endif /* __KERNEL__ */ |
| 207 | 207 | ||
| 208 | #endif | 208 | #endif /* ASM_X86__VM86_H */ |