diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /include/asm-m32r/mman.h | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'include/asm-m32r/mman.h')
| -rw-r--r-- | include/asm-m32r/mman.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-m32r/mman.h b/include/asm-m32r/mman.h index 695a860c024f..516a8973b130 100644 --- a/include/asm-m32r/mman.h +++ b/include/asm-m32r/mman.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman.h> |
| 5 | 5 | ||
| 6 | /* orig : i386 2.6.0-test6 */ | ||
| 7 | |||
| 8 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
| 9 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
| 10 | #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ | 8 | #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ |