enable intelli_plug in defconfig, fix intelli_plug error

Conflicts:
	arch/arm/configs/opensemc_fuji_hikari_row_defconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/intelli_plug.c