diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 17:55:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 17:55:24 +1000 |
| commit | a42bc5ef61cd6a1e7b9ef9a04a16bae628e23d6c (patch) | |
| tree | e41ef340022a85abeefa9cba070c30acda5e0b06 /arch/x86/include/asm/mman.h | |
| parent | fe8b44a9ede7df70b886e53d3ca609eaa675aaf1 (diff) | |
| parent | 52f9ce5dd9c55445b658cde1d3883afa871b4828 (diff) | |
Merge commit 'asm-generic/next'
Diffstat (limited to 'arch/x86/include/asm/mman.h')
| -rw-r--r-- | arch/x86/include/asm/mman.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h index 90bc4108a4fd..751af2550ed9 100644 --- a/arch/x86/include/asm/mman.h +++ b/arch/x86/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef _ASM_X86_MMAN_H #define _ASM_X86_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_32BIT 0x40 /* only give out 32bit addresses */ |