1 files changed, 6 insertions, 12 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 94195c190e1..3e15ff3bffb 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,21 +1,15 @@
 obj-y += io.o idle.o timer.o
-ifndef CONFIG_ARCH_MSM8X60
-obj-y += acpuclock-arm11.o
-obj-y += dma.o
-endif
-ifdef CONFIG_MSM_VIC
+obj-$(CONFIG_MSM_VIC) += irq-vic.o
-obj-y += irq-vic.o
-else
-ifndef CONFIG_ARCH_MSM8X60
-obj-y += irq.o
-endif
-endif
+obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o
+obj-$(CONFIG_ARCH_MSM7X30) += dma.o
+obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o
 obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o iommu.o iommu_dev.o devices-msm8x60-iommu.o
 obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
 obj-$(CONFIG_MSM_PROC_COMM) += clock.o
-obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
 obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
 obj-$(CONFIG_MSM_SMD) += last_radio_log.o
 obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 94195c190e1..3e15ff3bffb 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile
@@ -1,21 +1,15 @@
1	obj-y += io.o idle.o timer.o	1	obj-y += io.o idle.o timer.o
2	ifndef CONFIG_ARCH_MSM8X60
3	obj-y += acpuclock-arm11.o
4	obj-y += dma.o
5	endif
6		2
7	ifdef CONFIG_MSM_VIC	3	obj-$(CONFIG_MSM_VIC) += irq-vic.o
8	obj-y += irq-vic.o
9	else
10	ifndef CONFIG_ARCH_MSM8X60
11	obj-y += irq.o
12	endif
13	endif
14		4
		5	obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o
		6	obj-$(CONFIG_ARCH_MSM7X30) += dma.o
		7	obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o
15	obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o iommu.o iommu_dev.o devices-msm8x60-iommu.o	8	obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o iommu.o iommu_dev.o devices-msm8x60-iommu.o
		9
16	obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o	10	obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
17	obj-$(CONFIG_MSM_PROC_COMM) += clock.o	11	obj-$(CONFIG_MSM_PROC_COMM) += clock.o
18	obj-$(CONFIG_ARCH_QSD8X50) += sirc.o	12
19	obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o	13	obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
20	obj-$(CONFIG_MSM_SMD) += last_radio_log.o	14	obj-$(CONFIG_MSM_SMD) += last_radio_log.o
21	obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o	15	obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o