git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
h8300
/
include
/
asm
/
mman.h
diff --git
a/arch/h8300/include/asm/mman.h
b/arch/h8300/include/asm/mman.h
index b9f104f22a36a96b976758baca4215e47955b9df..cf35f0a6f12eee77729b51551f7a87bb3aeba477 100644
(file)
--- a/
arch/h8300/include/asm/mman.h
+++ b/
arch/h8300/include/asm/mman.h
@@
-1,7
+1,7
@@
#ifndef __H8300_MMAN_H__
#define __H8300_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 */