diff options
author | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
commit | a4ef0657e3075d0f951d78cc1398cb7e05af648a (patch) | |
tree | 9a4387de5845e6fd1331f0af32bfd82fac9eb039 /arch/arm/mach-uniphier | |
parent | 357040645f9f56b33909520483df9f840be7e181 (diff) | |
parent | cb3ef6810a27c8ddf5db8694bcef9337f27d12ce (diff) |
Merge branch '2019-12-02-master-imports'
- A large series of clean-ups to reduce common.h contents
Diffstat (limited to 'arch/arm/mach-uniphier')
-rw-r--r-- | arch/arm/mach-uniphier/arm32/cache-uniphier.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-uniphier/arm32/psci.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-uniphier/board_late_init.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c index 023b3396f5..b6e4abbad0 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <linux/io.h> #include <linux/kernel.h> #include <asm/armv7.h> diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index ef35923f6a..9a3793316a 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 14b61fc7df..793283058c 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -7,6 +7,7 @@ #include <common.h> #include <env.h> +#include <init.h> #include <spl.h> #include <linux/libfdt.h> #include <nand.h> |