drivers/media/video/msm/msm: fix compilation warning

Signed-off-by: Paul Reioux <reioux@gmail.com>
decompress_unlzo: fix compilation error

Signed-off-by: faux123 <reioux@gmail.com>
arch/arm/kernel/armksyms: fix merge derp

Signed-off-by: Paul Reioux <reioux@gmail.com>
fixing gpu clocks

Signed-off-by: Bryan Smith <zarboz@gmail.com>
fixing merge error

Signed-off-by: Bryan Smith <zarboz@gmail.com>

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c