diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
| commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
| tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-u300/include | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-u300/include')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/memory.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h index 02bd832f063e..c808f347a081 100644 --- a/arch/arm/mach-u300/include/mach/memory.h +++ b/arch/arm/mach-u300/include/mach/memory.h | |||
| @@ -14,11 +14,6 @@ | |||
| 14 | #define __MACH_MEMORY_H | 14 | #define __MACH_MEMORY_H |
| 15 | 15 | ||
| 16 | #define PLAT_PHYS_OFFSET UL(0x48000000) | 16 | #define PLAT_PHYS_OFFSET UL(0x48000000) |
| 17 | #define BOOT_PARAMS_OFFSET (PLAT_PHYS_OFFSET + 0x100) | 17 | #define BOOT_PARAMS_OFFSET 0x100 |
| 18 | |||
| 19 | /* | ||
| 20 | * We enable a real big DMA buffer if need be. | ||
| 21 | */ | ||
| 22 | #define CONSISTENT_DMA_SIZE SZ_4M | ||
| 23 | 18 | ||
| 24 | #endif | 19 | #endif |