diff options
author | Tom Rini | 2024-05-18 20:20:43 -0600 |
---|---|---|
committer | Tom Rini | 2024-05-19 08:16:36 -0600 |
commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /arch/arm/cpu/armv7/sunxi | |
parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi')
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/psci.c | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/sram.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index 4c30f3294b7..5cb8cfa6cf3 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -7,6 +7,7 @@ * which was based on code by Carl van Schaik <carl@ok-labs.com>. */ #include <config.h> +#include <common.h> #include <asm/cache.h> #include <asm/arch/cpu.h> diff --git a/arch/arm/cpu/armv7/sunxi/sram.c b/arch/arm/cpu/armv7/sunxi/sram.c index bc25719c9c4..28ff6a1b7c2 100644 --- a/arch/arm/cpu/armv7/sunxi/sram.c +++ b/arch/arm/cpu/armv7/sunxi/sram.c @@ -9,6 +9,7 @@ * SRAM init for older sunxi SoCs. */ +#include <common.h> #include <init.h> #include <asm/io.h> #include <asm/arch/cpu.h> |