• Arnd Bergmann's avatar
    Merge tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm into next/cleanup · c40f0128
    Arnd Bergmann authored
    * 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: default avatarArnd Bergmann <arnd@arndb.de>
    
    Conflicts:
    	arch/arm/mach-bcm/Kconfig
    c40f0128
Kconfig 2.37 KB