From: Jason Cooper <jason@lakedaemon.net>
Date: Sat, 1 Mar 2014 03:20:55 +0000 (+0000)
Subject: Merge branch 'mvebu/soc-3xx' into mvebu/soc
X-Git-Tag: firefly_0821_release~176^2~4133^2~14^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mvebu/soc-3xx' into mvebu/soc
---

aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf
diff --cc arch/arm/mach-mvebu/Kconfig
index 1ba825ee3fe5,00dc4a6ace6e..4b1eea09ae93
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -19,9 -19,9 +19,9 @@@ config ARCH_MVEB
  
  if ARCH_MVEBU
  
 -menu "Marvell SOC with device tree"
 +menu "Marvell EBU SoC variants"
  
- config MACH_ARMADA_370_XP
+ config MACH_MVEBU_V7
  	bool
  	select ARMADA_370_XP_TIMER
  	select HAVE_SMP