From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 22:44:17 +0000 (+0200)
Subject: Merge branch 'bcm/cleanup' into next/soc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'bcm/cleanup' into next/soc

Conflicts:
	arch/arm/mach-bcm/Kconfig
---

80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c
diff --cc arch/arm/mach-bcm/Kconfig
index 9f19636fea2f,28f90a01e3ac..b8cc9e8992f1
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@@ -10,7 -10,8 +10,7 @@@ if ARCH_BC
  menu "Broadcom SoC Selection"
  
  config ARCH_BCM_MOBILE
- 	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+ 	bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
 -	depends on MMU
  	select ARCH_REQUIRE_GPIOLIB
  	select ARM_ERRATA_754322
  	select ARM_ERRATA_764369 if SMP