projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[linux-2.6]
/
include
/
asm-m32r
/
mman.h
diff --git
a/include/asm-m32r/mman.h
b/include/asm-m32r/mman.h
index
695a860
..
516a897
100644
(file)
--- a/
include/asm-m32r/mman.h
+++ b/
include/asm-m32r/mman.h
@@
-3,8
+3,6
@@
#include <asm-generic/mman.h>
-/* orig : i386 2.6.0-test6 */
-
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */