From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] scripts/imx-usb-loader: Drop duplicate definition of ALIGN
Date: Tue, 15 Sep 2020 11:45:40 +0200 [thread overview]
Message-ID: <20200915094540.26840-1-u.kleine-koenig@pengutronix.de> (raw)
This fixes:
scripts/imx/imx-usb-loader.c:42: warning: "ALIGN" redefined
#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
In file included from scripts/imx/imx-usb-loader.c:35:
scripts/include/linux/kernel.h:10: note: this is the location of the previous definition
#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a) - 1)
Fixes: a876d16e6ad3 ("scripts: define ALIGN(x) in scripts' <linux/kernel.h>")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
scripts/imx/imx-usb-loader.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index 28f342633d43..e277d290352e 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -39,8 +39,6 @@
#define get_min(a, b) (((a) < (b)) ? (a) : (b))
-#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
-
#define FT_APP 0xaa
#define FT_CSF 0xcc
#define FT_DCD 0xee
--
2.27.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2020-09-15 9:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 9:45 Uwe Kleine-König [this message]
2020-09-15 12:27 ` Sascha Hauer
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=20200915094540.26840-1-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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