diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
| commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
| tree | 32a996a5123726b63c31a1522f230933fb967a32 /include/asm-arm/mach | |
| parent | e4e7b89280d1d666e2c09e5ad36cf071796c4c7e (diff) | |
| parent | b4103333d7904310d34de18d85e51e3d74f00a3b (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/mach')
| -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 *); |