[PATCH] scripts/imx-usb-loader: Drop duplicate definition of ALIGN
Sascha Hauer
s.hauer at pengutronix.de
Tue Sep 15 08:27:26 EDT 2020
On Tue, Sep 15, 2020 at 11:45:40AM +0200, Uwe Kleine-König wrote:
> 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 at pengutronix.de>
> ---
> scripts/imx/imx-usb-loader.c | 2 --
> 1 file changed, 2 deletions(-)
Applied, thanks
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list