From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 30 May 2012 08:48:29 +0000 (+0200)
Subject: ARM: dma-mapping: remove unconditional dependency on CMA
X-Git-Tag: sz_154~90
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=203b48254452e8479751194fc378eb475325cf83;p=pandora-kernel.git

ARM: dma-mapping: remove unconditional dependency on CMA

CMA has been enabled unconditionally on all ARMv6+ systems to solve the
long standing issue of double kernel mappings for all dma coherent
buffers. This however created a dependency on CONFIG_EXPERIMENTAL for
the whole ARM architecture what should be really avoided. This patch
removes this dependency and lets one use old, well-tested dma-mapping
implementation also on ARMv6+ systems without the need to use
EXPERIMENTAL stuff.

Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

Conflicts:

	arch/arm/mm/dma-mapping.c
---

Reading git-diff-tree failed