diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:44:17 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-24 00:44:17 +0200 |
| commit | 80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c (patch) | |
| tree | ba98513f6b5d676980145fef7092910141009eaa /arch/arm/mach-bcm/board_bcm21664.c | |
| parent | 3c2580173e3bc820a8f8c0db968f757b8eca7fe5 (diff) | |
| parent | eeda4cb92ee0fb63a5917738e107b0bc8168079e (diff) | |
Merge branch 'bcm/cleanup' into next/soc
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" |