diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-12 21:18:43 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-13 09:14:38 (GMT) |
| commit | b5932cc839d809a07a43b93555ccc3fbabc2a766 (patch) | |
| tree | 528d7a0b3353c08ec7461dee80d7d3151061dc07 /arch/arm/mach-davinci/common.c | |
| parent | a5434fc9e2ad9bac545f058a24b284c051a1faae (diff) | |
| parent | 16cf8a80a8f0f4757427b17cdfb6c4897674db68 (diff) | |
| download | linux-b5932cc839d809a07a43b93555ccc3fbabc2a766.tar.xz | |
Merge branch 'cleanups/dma' into next/cleanup
Separate patches from Marek Szyprowski <m.szyprowski@samsung.com>:
Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
region") replaced custom consistent memory handling, so setting
consistent dma memory size is not longer required. This patch series
cleans sub-architecture platform code to remove all calls to the
obsolated init_consistent_dma_size() function and finally removes the
init_consistent_dma_size() stub itself.
* cleanups/dma:
ARM: at91: remove obsoleted init_consistent_dma_size()
ARM: u300: remove obsoleted init_consistent_dma_size()
ARM: dma-mapping: remove init_consistent_dma_size() stub
ARM: shmobile: remove obsoleted init_consistent_dma_size()
ARM: davinci: remove obsoleted init_consistent_dma_size()
ARM: samsung: remove obsoleted init_consistent_dma_size()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-davinci/common.c')
| -rw-r--r-- | arch/arm/mach-davinci/common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index 64b0f65..a794f6d 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -87,8 +87,6 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info) iotable_init(davinci_soc_info.io_desc, davinci_soc_info.io_desc_num); - init_consistent_dma_size(14 << 20); - /* * Normally devicemaps_init() would flush caches and tlb after * mdesc->map_io(), but we must also do it here because of the CPU |