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/uaccess.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/uaccess.h')
| -rw-r--r-- | include/asm-x86/uaccess.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/uaccess.h b/include/asm-x86/uaccess.h index 5f702d1d5218..48ebc0ad40ec 100644 --- a/include/asm-x86/uaccess.h +++ b/include/asm-x86/uaccess.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_UACCES_H_ | 1 | #ifndef ASM_X86__UACCESS_H |
| 2 | #define _ASM_UACCES_H_ | 2 | #define ASM_X86__UACCESS_H |
| 3 | /* | 3 | /* |
| 4 | * User space memory access functions | 4 | * User space memory access functions |
| 5 | */ | 5 | */ |
| @@ -450,5 +450,5 @@ extern struct movsl_mask { | |||
| 450 | # include "uaccess_64.h" | 450 | # include "uaccess_64.h" |
| 451 | #endif | 451 | #endif |
| 452 | 452 | ||
| 453 | #endif | 453 | #endif /* ASM_X86__UACCESS_H */ |
| 454 | 454 | ||