aboutsummaryrefslogtreecommitdiff
path: root/include/dm
diff options
context:
space:
mode:
authorTom Rini2024-05-18 20:20:43 -0600
committerTom Rini2024-05-19 08:16:36 -0600
commitd678a59d2d719da9e807495b4b021501f2836ca5 (patch)
tree313e5c32e3d02d3cf1904875b1655140973126e9 /include/dm
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 <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/dm')
-rw-r--r--include/dm/of.h1
-rw-r--r--include/dm/test.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/dm/of.h b/include/dm/of.h
index b7404c139d1..b1c934f610d 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -7,6 +7,7 @@
#ifndef _DM_OF_H
#define _DM_OF_H
+#include <asm/u-boot.h>
#include <asm/global_data.h>
/* integer value within a device tree property which references another node */
diff --git a/include/dm/test.h b/include/dm/test.h
index 02737411a16..b5937509212 100644
--- a/include/dm/test.h
+++ b/include/dm/test.h
@@ -6,8 +6,6 @@
#ifndef __DM_TEST_H
#define __DM_TEST_H
-#include <linux/types.h>
-
struct udevice;
/**