Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-cns3xxx / Makefile

diff --git a/arch/arm/mach-cns3xxx/Makefile b/arch/arm/mach-cns3xxx/Makefile
index 11033f1c2e23b82b52d96569fb4932be6a1a11c0..a1ff10848698947f07f464180cfb61644a815c36 100644 (file)
--- a/arch/arm/mach-cns3xxx/Makefile
+++ b/arch/arm/mach-cns3xxx/Makefile
@@ -1,3 +1,5 @@
-obj-$(CONFIG_ARCH_CNS3XXX)             += core.o pm.o devices.o
-obj-$(CONFIG_PCI)                      += pcie.o
-obj-$(CONFIG_MACH_CNS3420VB)           += cns3420vb.o
+obj-$(CONFIG_ARCH_CNS3XXX)             += cns3xxx.o
+cns3xxx-y                              += core.o pm.o
+cns3xxx-$(CONFIG_ATAGS)                        += devices.o
+cns3xxx-$(CONFIG_PCI)                  += pcie.o
+cns3xxx-$(CONFIG_MACH_CNS3420VB)       += cns3420vb.o