From: Angelo Dureghello <angelo@kernel-space.org>
To: trini@konsulko.com
Cc: u-boot@lists.denx.de, Angelo Dureghello <angelo@kernel-space.org>
Subject: [PATCH] m68k: remove common.h references
Date: Sat, 4 Nov 2023 22:25:25 +0100 [thread overview]
Message-ID: <20231104212525.260981-1-angelo@kernel-space.org> (raw)
In one case (mcffec.c), had to replace common.h include with
config.h, to avoid CFG_SYS_CACHE_ACR0 redefine-order conflict.
Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>
---
drivers/net/mcffec.c | 2 +-
drivers/net/mcfmii.c | 1 -
drivers/rtc/mcfrtc.c | 2 --
drivers/serial/serial_mcf.c | 1 -
drivers/watchdog/mcf_wdt.c | 1 -
5 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index ec1fae9688..4e0a9a8b7c 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -10,8 +10,8 @@
* (C) 2019 Angelo Dureghello <angelo.dureghello@timesys.com>
*/
-#include <common.h>
#include <env.h>
+#include <config.h>
#include <hang.h>
#include <malloc.h>
#include <command.h>
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index eae2065451..9bf887035d 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -4,7 +4,6 @@
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
*/
-#include <common.h>
#include <config.h>
#include <net.h>
#include <netdev.h>
diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c
index d2ac889c30..9708971c5c 100644
--- a/drivers/rtc/mcfrtc.c
+++ b/drivers/rtc/mcfrtc.c
@@ -4,8 +4,6 @@
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
*/
-#include <common.h>
-
#include <command.h>
#include <rtc.h>
#include <asm/immap.h>
diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c
index bb2afd0d8c..76143575fa 100644
--- a/drivers/serial/serial_mcf.c
+++ b/drivers/serial/serial_mcf.c
@@ -15,7 +15,6 @@
* as serial console interface.
*/
-#include <common.h>
#include <dm.h>
#include <asm/global_data.h>
#include <dm/platform_data/serial_coldfire.h>
diff --git a/drivers/watchdog/mcf_wdt.c b/drivers/watchdog/mcf_wdt.c
index b36488bb5b..b555bbeb68 100644
--- a/drivers/watchdog/mcf_wdt.c
+++ b/drivers/watchdog/mcf_wdt.c
@@ -6,7 +6,6 @@
*
*/
-#include <common.h>
#include <dm.h>
#include <hang.h>
#include <asm/io.h>
--
2.42.0
reply other threads:[~2023-11-04 21:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231104212525.260981-1-angelo@kernel-space.org \
--to=angelo@kernel-space.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox