Merge 23 - Fix errors
#modified:   arch/arm/mach-msm/board-msm8x60_dali.c
#modified:   include/linux/input/pmic8xxx-pwrkey.h
#modified:   include/linux/pmic8058-xoadc.h

Signed-off-by: cholokei <leesl0416@naver.com>