git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
mman.h
diff --git
a/arch/m68k/include/asm/mman.h
b/arch/m68k/include/asm/mman.h
index
1626d37
..
9f5c4c4
100644
(file)
--- a/
arch/m68k/include/asm/mman.h
+++ b/
arch/m68k/include/asm/mman.h
@@
-1,7
+1,7
@@
#ifndef __M68K_MMAN_H__
#define __M68K_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 */