From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 5 May 2014 01:26:36 +0000 (+0000)
Subject: Merge branch 'mvebu/soc' into for-next
X-Git-Tag: next-20140506~94^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d40129936f88ef359705fd31b08cd07a1ffbc076;p=karo-tx-linux.git

Merge branch 'mvebu/soc' into for-next
---

d40129936f88ef359705fd31b08cd07a1ffbc076
diff --cc arch/arm/mach-mvebu/Makefile
index ec0b2177d991,6f2a063f05d8..854b72af9faa
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@@ -3,14 -3,10 +3,13 @@@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) :
  
  AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a
  
 -obj-y				 += system-controller.o mvebu-soc-id.o cpu-reset.o
 -obj-$(CONFIG_MACH_MVEBU_V7)      += board-v7.o
 +obj-y				 += system-controller.o mvebu-soc-id.o
 +
 +ifeq ($(CONFIG_MACH_MVEBU_V7),y)
 +obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o
 +obj-$(CONFIG_SMP)		 += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
 +obj-$(CONFIG_HOTPLUG_CPU)	 += hotplug.o
 +endif
 +
  obj-$(CONFIG_MACH_DOVE)		 += dove.o
 -obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
 -obj-$(CONFIG_SMP)                += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
 -obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
  obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
- obj-$(CONFIG_MACH_T5325)	 += board-t5325.o