Fix mismerge
Mismerge from 9ce7b4c8677d6bd7bc5fdb25a8b7823855d73fc3
#modified:   arch/arm/mach-msm/Kconfig
#modified:   arch/arm/mach-msm/Makefile
#modified:   arch/arm/mach-msm/Makefile.boot
#renamed:    arch/arm/mach-msm/avs_hw.c -> arch/arm/mach-msm/avs.c
#renamed:    arch/arm/mach-msm/avs_hw.h -> arch/arm/mach-msm/avs.h

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