android: ion: fix merge conflict

Change-Id: I67384400657ce896baccc67e7f94ac7bd2988116
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>

diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
index d142489039111c51563b9c3d75ee4a3e896e149c..75b54c7d03bf72f63d801728452346fcc044d8c9 100644 (file)
--- a/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@ -75,11 +75,8 @@
 #define ARM_CPU_IMP_CAVIUM             0x43
 #define ARM_CPU_IMP_BRCM               0x42
 #define ARM_CPU_IMP_QCOM               0x51
-<<<<<<< HEAD
 #define ARM_CPU_IMP_SEC                        0x53
-=======
 #define ARM_CPU_IMP_NVIDIA             0x4E
->>>>>>> 818299f6bdae
 
 #define ARM_CPU_PART_AEM_V8            0xD0F
 #define ARM_CPU_PART_FOUNDATION                0xD00

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 8197e29513aa447f963481a4d2d86c1bb6d0ffac..20be163b01f29b5e107b0cf21966411edc84aec4 100644 (file)
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -134,14 +134,10 @@ err2:
 
 void ion_buffer_destroy(struct ion_buffer *buffer)
 {
-<<<<<<< HEAD
        exynos_ion_free_fixup(buffer);
-       if (WARN_ON(buffer->kmap_cnt > 0))
-=======
        if (buffer->kmap_cnt > 0) {
                pr_warn_once("%s: buffer still mapped in the kernel\n",
                             __func__);
->>>>>>> 818299f6bdae
                buffer->heap->ops->unmap_kernel(buffer->heap, buffer);
        }
        buffer->heap->ops->free(buffer);