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-bcmring/include/mach/memory.h | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-bcmring/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-bcmring/include/mach/memory.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/memory.h b/arch/arm/mach-bcmring/include/mach/memory.h index 15162e4c75f9..8848a5bb3445 100644 --- a/arch/arm/mach-bcmring/include/mach/memory.h +++ b/arch/arm/mach-bcmring/include/mach/memory.h | |||
| @@ -25,9 +25,4 @@ | |||
| 25 | 25 | ||
| 26 | #define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE | 26 | #define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE |
| 27 | 27 | ||
| 28 | /* | ||
| 29 | * Maximum DMA memory allowed is 14M | ||
| 30 | */ | ||
| 31 | #define CONSISTENT_DMA_SIZE (SZ_16M - SZ_2M) | ||
| 32 | |||
| 33 | #endif | 28 | #endif |