From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 22:28:55 +0000 (+0200)
Subject: Merge tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm into next... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c40f01287b3369638c9cb145298a79cc7103f696;p=linux-beck.git

Merge tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm into next/cleanup

* Clean up mach-bcm config and build targets
* Clean up bcm281xx/21664 SMC code
* Clean up bcm281xx/21664 L2C code

* tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm:
  ARM: bcm: rename "kona.h" and "kona.c"
  ARM: bcm: rewrite commentary for bcm_kona_do_smc()
  ARM: bcm: use inline assembly for "smc" request
  ARM: bcm: tidy up a few includes
  ARM: bcm: config option for l2 cache support
  ARM: bcm: don't special-case CPU 0 in bcm_kona_smc()
  ARM: bcm: have bcm_kona_smc() return request result
  ARM: bcm: clean up SMC code
  ARM: bcm: err, don't BUG() on SMC init failures
  ARM: bcm: use memory accessors for ioremapped area
  ARM: bcm: clean up config and build targets

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

c40f01287b3369638c9cb145298a79cc7103f696
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