Add ifdef around SEKONIX_LENS_ACT specific actuator position in power
down.

Change-Id: Ifc26a78951d3bbf00b0f7fdf4fb44b9ec252f836

Conflicts:
	drivers/media/video/msm/actuators/msm_actuator.c
Add ifdef around SEKONIX_LENS_ACT specific actuator position in power
down.

Change-Id: Ifc26a78951d3bbf00b0f7fdf4fb44b9ec252f836

Conflicts:
	drivers/media/video/msm/actuators/msm_actuator.c
Fix some errors
Fix typo of msm8960 to apq8064 in board file
Fix merge conflicts
Fix more conflicts
Clean code in board-8064 to fix some errors
Revert "mako: set the mako own machine number"

This reverts commit 90c6ab1c2faa561a9d027109c377927368603c03.

Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-display.c
	arch/arm/mach-msm/lge/mako/board-mako-gpiomux.c
	arch/arm/mach-msm/lge/mako/board-mako-nfc.c
	arch/arm/mach-msm/lge/mako/board-mako-sound.c
	arch/arm/mach-msm/lge/mako/board-mako.c
	arch/arm/tools/mach-types
Fix error in board-mako
Add pm8921 drivers
Fix actuator conflict
Merge branch 'jb_2.5' of github.com:xboxfanj/kernel_caf_2.5 into jb_2.5