summaryrefslogtreecommitdiff
path: root/board/solidrun
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-05-20 13:35:03 -0600
committerTom Rini <[email protected]>2024-05-20 13:35:03 -0600
commit03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch)
tree57d5eac5f8efb015eb0415824512a29d5e20638e /board/solidrun
parentd4781422d1268aa6deca3e49d2fb227e79c160b4 (diff)
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow for all of these changes to exist here. Reported-by: Jonas Karlman <[email protected]> Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'board/solidrun')
-rw-r--r--board/solidrun/clearfog/clearfog.c2
-rw-r--r--board/solidrun/common/tlv_data.c2
-rw-r--r--board/solidrun/mx6cuboxi/mx6cuboxi.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 6977db0a9e2..2dbd071abd9 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -3,7 +3,7 @@
* Copyright (C) 2015 Stefan Roese <[email protected]>
*/
-#include <common.h>
+#include <config.h>
#include <env.h>
#include <i2c.h>
#include <init.h>
diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c
index cf5824886c3..b8086605c3a 100644
--- a/board/solidrun/common/tlv_data.c
+++ b/board/solidrun/common/tlv_data.c
@@ -3,9 +3,9 @@
* Copyright 2020 SolidRun
*/
-#include <common.h>
#include <compiler.h>
#include <tlv_eeprom.h>
+#include <linux/kernel.h>
#include "tlv_data.h"
#define SR_TLV_CODE_RAM_SIZE 0x81
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index 7f4811d8879..3406ba8616e 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -15,7 +15,7 @@
* Ported to SolidRun microSOM by Rabeeh Khoury <[email protected]>
*/
-#include <common.h>
+#include <config.h>
#include <image.h>
#include <init.h>
#include <log.h>