aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-04-04 13:50:43 -0700
committerArve Hjønnevåg <arve@android.com>2013-04-29 14:42:44 -0700
commit1619e57670557b5b9cc3a0fc099d457c57da51b6 (patch)
tree3cb2ab8d1bc0779d512b05dd79aad1546dcfbd52
parent0c70611cd671d7ea0bf6362c0fcfad442f6d926b (diff)
gpu: ion: ion_carveout_heap: fix for 3.4
__arch_ioremap is no longer available, use __arm_ioremap instead. Change-Id: Ied98208a3c1be6bc5ac195c3ade496fbb5003f37 Signed-off-by: Colin Cross <ccross@android.com>
-rw-r--r--drivers/gpu/ion/ion_carveout_heap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/ion/ion_carveout_heap.c b/drivers/gpu/ion/ion_carveout_heap.c
index 606adae13f4..b4fcb3c9247 100644
--- a/drivers/gpu/ion/ion_carveout_heap.c
+++ b/drivers/gpu/ion/ion_carveout_heap.c
@@ -99,14 +99,14 @@ void ion_carveout_heap_unmap_dma(struct ion_heap *heap,
void *ion_carveout_heap_map_kernel(struct ion_heap *heap,
struct ion_buffer *buffer)
{
- return __arch_ioremap(buffer->priv_phys, buffer->size,
+ return __arm_ioremap(buffer->priv_phys, buffer->size,
MT_MEMORY_NONCACHED);
}
void ion_carveout_heap_unmap_kernel(struct ion_heap *heap,
struct ion_buffer *buffer)
{
- __arch_iounmap(buffer->vaddr);
+ __arm_iounmap(buffer->vaddr);
buffer->vaddr = NULL;
return;
}