commit 56b933a8c8b185a0bce016518e5a8ef6d95b2e96
author Jeff Hugo <jhugo@codeaurora.org> Wed Sep 28 14:42:05 2011 -0600
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:13:53 2011 -0700
tree eae9ff671ea1ea35ccf8c7643bbc534beb69b918
parent 0c55b7441513c935fec0a82cebcd408fe33b70bf

msm: smd: add support for 9615

Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/board-9615.c
	arch/arm/mach-msm/devices-9615.c

arch/arm/mach-msm/Makefile

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 22d640a..db154de 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -73,6 +73,7 @@
 obj-$(CONFIG_MSM_SMD_LOGGING) += smem_log.o
 obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o remote_spinlock.o
         obj-y += socinfo.o
+ifndef CONFIG_ARCH_MSM9615
 ifndef CONFIG_ARCH_MSM8960
 ifndef CONFIG_ARCH_MSM8X60
 	obj-$(CONFIG_MSM_SMD) += pmic.o
@@ -82,6 +83,7 @@
 	obj-$(CONFIG_MSM_ONCRPCROUTER) += rpc_hsusb.o rpc_pmapp.o rpc_fsusb.o
 endif
 endif
+endif
 obj-$(CONFIG_MSM_SDIO_TTY) += sdio_tty.o sdio_tty_ciq.o
 obj-$(CONFIG_MSM_SMD_TTY) += smd_tty.o
 obj-$(CONFIG_MSM_SMD_QMI) += smd_qmi.o