rk: ion: fix compilation error on arm64
authorCMY <cmy@rock-chips.com>
Fri, 24 Oct 2014 06:12:22 +0000 (14:12 +0800)
committerCMY <cmy@rock-chips.com>
Fri, 26 Dec 2014 05:00:41 +0000 (13:00 +0800)
commitee0b7b6a5089bc4ed32fa99ecd911d9e340e0a49
tree25055e9e4a361d081af112f56452274081b3f15d
parent72dca47db44009a46ade2691ecc853c3600449f9
rk: ion: fix compilation error on arm64

Conflicts:

drivers/staging/android/ion/rockchip/rockchip_ion.c
include/linux/rockchip_ion.h
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion_carveout_heap.c
drivers/staging/android/ion/ion_cma_heap.c
drivers/staging/android/ion/ion_drm_heap.c
drivers/staging/android/ion/ion_priv.h
drivers/staging/android/ion/ion_system_heap.c
drivers/staging/android/ion/rockchip/rockchip_ion.c
drivers/staging/android/ion/rockchip/rockchip_ion_snapshot.c
drivers/staging/android/trace/ion.h