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

* 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

diff --cc arch/arm/mach-bcm/Kconfig
index 9f19636fea2f656392c84fdff74f08e909db14ca,28f90a01e3acbe585e8550ccc61773027a8dd643..b8cc9e8992f1ba23ccc0c8bc106db7746bc9b5fd
--- 1/arch/arm/mach-bcm/Kconfig
--- 2/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