diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 22:17:07 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 22:17:07 -0400 |
| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 (patch) | |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 /include/asm-blackfin/mach-bf533/mem_map.h | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
| parent | c1b362e3b4d331a63915b268a33207311a439d60 (diff) | |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Diffstat (limited to 'include/asm-blackfin/mach-bf533/mem_map.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf533/mem_map.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-blackfin/mach-bf533/mem_map.h b/include/asm-blackfin/mach-bf533/mem_map.h index bd30b6f3be00..581fc6eea789 100644 --- a/include/asm-blackfin/mach-bf533/mem_map.h +++ b/include/asm-blackfin/mach-bf533/mem_map.h | |||
| @@ -158,6 +158,11 @@ | |||
| 158 | 158 | ||
| 159 | #endif | 159 | #endif |
| 160 | 160 | ||
| 161 | /* Level 2 Memory - none */ | ||
| 162 | |||
| 163 | #define L2_START 0 | ||
| 164 | #define L2_LENGTH 0 | ||
| 165 | |||
| 161 | /* Scratch Pad Memory */ | 166 | /* Scratch Pad Memory */ |
| 162 | 167 | ||
| 163 | #define L1_SCRATCH_START 0xFFB00000 | 168 | #define L1_SCRATCH_START 0xFFB00000 |