--- arch/arm/mach-msm/Makefile

+++ arch/arm/mach-msm/Makefile

@@ -7,7 +7,6 @@ endif

obj-y += clock.o clock-voter.o clock-dummy.o

obj-y += modem_notifier.o subsystem_map.o

obj-$(CONFIG_CPU_FREQ_MSM) += cpufreq.o

-obj-$(CONFIG_MSM_MPDEC) += msm_mpdecision.o

obj-$(CONFIG_DEBUG_FS) += nohlt.o clock-debug.o

obj-$(CONFIG_KEXEC) += msm_kexec.o

@@ -85,7 +84,7 @@ obj-$(CONFIG_MSM_SDIO_AL) += sdio_al_dlo

obj-$(CONFIG_MSM_SDIO_DMUX) += sdio_dmux.o

obj-$(CONFIG_MSM_BAM_DMUX) += bam_dmux.o

obj-$(CONFIG_MSM_SMD_LOGGING) += smem_log.o

-obj-$(CONFIG_MSM_SMD) += smd.o remote_spinlock.o

+obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o remote_spinlock.o

obj-y += socinfo.o

ifndef CONFIG_ARCH_MSM9615

ifndef CONFIG_ARCH_APQ8064