Revert "rk: ion: support cache ops for CMA heap"
authorCMY <cmy@rock-chips.com>
Wed, 14 May 2014 02:40:01 +0000 (10:40 +0800)
committerCMY <cmy@rock-chips.com>
Wed, 14 May 2014 02:40:01 +0000 (10:40 +0800)
commit2305db926f97a98b8ebc42c91022c3981a0dad21
tree06c2c8d7ab67d953968993922802728733a12fec
parent9af754f0e9c316ddd93fb980506eefcd7a2135ed
Revert "rk: ion: support cache ops for CMA heap"

This reverts commit 98ad00141cb4382996166f9cd82e9d203b256864.

Conflicts:
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion_cma_heap.c
drivers/staging/android/ion/ion_priv.h
arch/arm/include/asm/dma-mapping.h [changed mode: 0755->0644]
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion_cma_heap.c
drivers/staging/android/ion/ion_priv.h
drivers/staging/android/ion/rockchip/rockchip_ion.c
include/linux/rockchip_ion.h [changed mode: 0755->0644]