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>
diff --git a/api/api.c b/api/api.c
index d22132f..89003c1 100644
--- a/api/api.c
+++ b/api/api.c
@@ -7,13 +7,11 @@
#include <config.h>
#include <command.h>
+#include <common.h>
#include <env.h>
#include <malloc.h>
-#include <time.h>
#include <env_internal.h>
-#include <vsprintf.h>
#include <linux/delay.h>
-#include <linux/errno.h>
#include <linux/types.h>
#include <api_public.h>
#include <u-boot/crc.h>
diff --git a/api/api_display.c b/api/api_display.c
index 8fd078c..2e877a8 100644
--- a/api/api_display.c
+++ b/api/api_display.c
@@ -3,9 +3,9 @@
* Copyright (c) 2011 The Chromium OS Authors.
*/
+#include <common.h>
#include <api_public.h>
#include <log.h>
-#include <linux/types.h>
/* TODO(clchiou): add support of video device */
diff --git a/api/api_net.c b/api/api_net.c
index 264ff53..7515c26 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -6,6 +6,7 @@
*/
#include <config.h>
+#include <common.h>
#include <net.h>
#include <linux/types.h>
#include <api_public.h>
diff --git a/api/api_platform-arm.c b/api/api_platform-arm.c
index 9afba66..6cfd9e6 100644
--- a/api/api_platform-arm.c
+++ b/api/api_platform-arm.c
@@ -12,6 +12,7 @@
#include <linux/types.h>
#include <api_public.h>
+#include <asm/u-boot.h>
#include <asm/global_data.h>
#include "api_private.h"
diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c
index 262b35a..e150966 100644
--- a/api/api_platform-mips.c
+++ b/api/api_platform-mips.c
@@ -9,6 +9,7 @@
#include <linux/types.h>
#include <api_public.h>
+#include <asm/u-boot.h>
#include <asm/global_data.h>
#include "api_private.h"
diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c
index 3a04a9f..847a4a3 100644
--- a/api/api_platform-powerpc.c
+++ b/api/api_platform-powerpc.c
@@ -12,6 +12,7 @@
#include <linux/types.h>
#include <api_public.h>
+#include <asm/u-boot.h>
#include <asm/global_data.h>
#include "api_private.h"
diff --git a/api/api_storage.c b/api/api_storage.c
index 3d2d9d6..78becbe 100644
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -6,10 +6,10 @@
*/
#include <config.h>
+#include <common.h>
#include <api_public.h>
#include <part.h>
#include <scsi.h>
-#include <linux/types.h>
#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
#include <usb.h>