diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/mach-u300 | |
| parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
| parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/memory.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h index ab000df7fc03..bf134bcc129d 100644 --- a/arch/arm/mach-u300/include/mach/memory.h +++ b/arch/arm/mach-u300/include/mach/memory.h | |||
| @@ -35,14 +35,6 @@ | |||
| 35 | #endif | 35 | #endif |
| 36 | 36 | ||
| 37 | /* | 37 | /* |
| 38 | * TCM memory whereabouts | ||
| 39 | */ | ||
| 40 | #define ITCM_OFFSET 0xffff2000 | ||
| 41 | #define ITCM_END 0xffff3fff | ||
| 42 | #define DTCM_OFFSET 0xffff4000 | ||
| 43 | #define DTCM_END 0xffff5fff | ||
| 44 | |||
| 45 | /* | ||
| 46 | * We enable a real big DMA buffer if need be. | 38 | * We enable a real big DMA buffer if need be. |
| 47 | */ | 39 | */ |
| 48 | #define CONSISTENT_DMA_SIZE SZ_4M | 40 | #define CONSISTENT_DMA_SIZE SZ_4M |