gpu: ion: ion_carveout_heap: fix for 3.4

__arch_ioremap is no longer available, use __arm_ioremap instead.

Signed-off-by: Colin Cross <ccross@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index 6d02cd3066024d2721e5f7bf8b1c9d515a541c78..e8c4e36d532868d8480fba55f6764477bb052b7c 100644 (file)
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/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;
 }