summaryrefslogtreecommitdiff
path: root/common/init
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-05-18 20:20:43 -0600
committerTom Rini <[email protected]>2024-05-19 08:16:36 -0600
commitd678a59d2d719da9e807495b4b021501f2836ca5 (patch)
tree313e5c32e3d02d3cf1904875b1655140973126e9 /common/init
parent3be9f399e911cfc437a37ac826441f1d96da1c9b (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 <[email protected]> Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'common/init')
-rw-r--r--common/init/board_init.c2
-rw-r--r--common/init/handoff.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c
index a06ec1caa2c..ed2365daa35 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -6,7 +6,7 @@
* Written by Simon Glass <[email protected]>
*/
-#include <config.h>
+#include <common.h>
#include <bootstage.h>
#include <init.h>
#include <asm/global_data.h>
diff --git a/common/init/handoff.c b/common/init/handoff.c
index a7cd065fb38..d0be1bb17a2 100644
--- a/common/init/handoff.c
+++ b/common/init/handoff.c
@@ -5,6 +5,7 @@
* Copyright 2018 Google, Inc
*/
+#include <common.h>
#include <handoff.h>
#include <asm/global_data.h>