From f5880ec3d922eb658f4d6af17755bdb11e8b6ece Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 8 Nov 2012 08:46:23 +0100 Subject: [PATCH] --- yaml --- r: 339784 b: refs/heads/master c: 16cf8a80a8f0f4757427b17cdfb6c4897674db68 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/dma-mapping.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 567771b28805..62130dbb6968 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f02dfada8b172dee86e77ecf13dd5a72dba9e47c +refs/heads/master: 16cf8a80a8f0f4757427b17cdfb6c4897674db68 diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h index 23004847bb05..8ea02ac3ec1a 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/arch/arm/include/asm/dma-mapping.h @@ -210,13 +210,6 @@ static inline void dma_free_writecombine(struct device *dev, size_t size, */ extern void __init init_dma_coherent_pool_size(unsigned long size); -/* - * This can be called during boot to increase the size of the consistent - * DMA region above it's default value of 2MB. It must be called before the - * memory allocator is initialised, i.e. before any core_initcall. - */ -static inline void init_consistent_dma_size(unsigned long size) { } - /* * For SA-1111, IXP425, and ADI systems the dma-mapping functions are "magic" * and utilize bounce buffers as needed to work around limited DMA windows.