diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:28:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:29:10 +0200 |
| commit | c40f01287b3369638c9cb145298a79cc7103f696 (patch) | |
| tree | 65568873d4d71c04882aafd880947c3302a3c08f /arch/arm/mach-bcm/board_bcm21664.c | |
| parent | Merge tag 's3c24xx-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kge... (diff) | |
| parent | ARM: bcm: rename "kona.h" and "kona.c" (diff) | |
| download | linux-c40f01287b3369638c9cb145298a79cc7103f696.tar.xz linux-c40f01287b3369638c9cb145298a79cc7103f696.zip | |
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
Diffstat (limited to 'arch/arm/mach-bcm/board_bcm21664.c')
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm21664.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c index acc1573fd005..f0521cc0640d 100644 --- a/arch/arm/mach-bcm/board_bcm21664.c +++ b/arch/arm/mach-bcm/board_bcm21664.c @@ -11,14 +11,13 @@ * GNU General Public License for more details. */ -#include <linux/clocksource.h> #include <linux/of_address.h> #include <linux/of_platform.h> +#include <linux/io.h> #include <asm/mach/arch.h> -#include "bcm_kona_smc.h" -#include "kona.h" +#include "kona_l2_cache.h" #define RSTMGR_DT_STRING "brcm,bcm21664-resetmgr" |