diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
| commit | 6cb6524d90b6e5497e79a1474bdb2f26755d1c02 (patch) | |
| tree | fd475ac8f57a6bd39c976056324d1bc79d11b4c9 /include/asm-arm/mach/map.h | |
| parent | 837e9594fc3cb9a06bddd7ecf66151334a2e13d2 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-arm/mach/map.h')
| -rw-r--r-- | include/asm-arm/mach/map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h index 3351b77fab36..e8ea67c97c73 100644 --- a/include/asm-arm/mach/map.h +++ b/include/asm-arm/mach/map.h | |||
| @@ -26,6 +26,7 @@ struct meminfo; | |||
| 26 | #define MT_MEMORY 5 | 26 | #define MT_MEMORY 5 |
| 27 | #define MT_ROM 6 | 27 | #define MT_ROM 6 |
| 28 | #define MT_IXP2000_DEVICE 7 | 28 | #define MT_IXP2000_DEVICE 7 |
| 29 | #define MT_NONSHARED_DEVICE 8 | ||
| 29 | 30 | ||
| 30 | extern void create_memmap_holes(struct meminfo *); | 31 | extern void create_memmap_holes(struct meminfo *); |
| 31 | extern void memtable_init(struct meminfo *); | 32 | extern void memtable_init(struct meminfo *); |