commit 121caec45b47075ee979e5378b1f8d2b2184b7dd
author Sahitya Tummala <stummala@codeaurora.org> Sat Oct 01 08:32:05 2011 +0530
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:14:33 2011 -0700
tree 8f4d3950b3295073bd0685d3cc7bb82bacb36c0a
parent 5ff7784d8fc6ee8156d01b39601cf5b6b15e0fc1

msm: nand: compile nand_partitions.c for all NAND based targets

The recent commit bad89b doesn't compile nand_partitions.c for 9615
on which it must be compiled. This patch fixes it.

Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>

arch/arm/mach-msm/Makefile

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 931cb94..9c7c830 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -78,11 +78,15 @@
 ifndef CONFIG_ARCH_MSM8960
 ifndef CONFIG_ARCH_MSM8X60
 	obj-$(CONFIG_MSM_SMD) += pmic.o
+	obj-$(CONFIG_MSM_ONCRPCROUTER) += rpc_hsusb.o rpc_pmapp.o rpc_fsusb.o
+endif
+endif
+endif
+ifndef CONFIG_ARCH_MSM8960
+ifndef CONFIG_ARCH_MSM8X60
 ifndef CONFIG_ARCH_APQ8064
 	obj-y += nand_partitions.o
 endif
-	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