felica: fix compile error and mismerge
felica: Add GSBI_UARTDM to support FeliCa

Conflicts:

	arch/arm/configs/valente_wx_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/include/mach/dma.h
devices-8960: fix mismerge