diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
| commit | bff7b55bdb325f62c4e30a97883ebd2b536bd47b (patch) | |
| tree | de4ab64ec0837ae308e17312b553e9a5209b6f62 /arch/m32r/include/asm/mman.h | |
| parent | e7fad451f06e21e74b6051c5ad4917e37460be3a (diff) | |
| parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
| download | op-kernel-dev-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.zip op-kernel-dev-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/m32r/include/asm/mman.h')
| -rw-r--r-- | arch/m32r/include/asm/mman.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/mman.h b/arch/m32r/include/asm/mman.h index 516a897..04a5f40 100644 --- a/arch/m32r/include/asm/mman.h +++ b/arch/m32r/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __M32R_MMAN_H__ #define __M32R_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
