Message ID | 2124b8aa715da12edc591cc1eb0dfc2cbc50be42.1415717133.git.michal.simek@xilinx.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Tue, Nov 11, 2014 at 03:45:36PM +0100, Michal Simek wrote: > This reverts commit 1e96220a5687efae2aed45ce56e143336c40d0a7. > > Remove duplicated vxworks.h header. > The same change was done by > "ARM: prevent compiler warnings from bootm.c" > (sha1: 8d196e52b58d1e50a80c2f5067b201cda521c75c) > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index cdb197510588..4949d573af8c 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -15,7 +15,6 @@ #include <common.h> #include <command.h> #include <image.h> -#include <vxworks.h> #include <u-boot/zlib.h> #include <asm/byteorder.h> #include <libfdt.h>
This reverts commit 1e96220a5687efae2aed45ce56e143336c40d0a7. Remove duplicated vxworks.h header. The same change was done by "ARM: prevent compiler warnings from bootm.c" (sha1: 8d196e52b58d1e50a80c2f5067b201cda521c75c) Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/lib/bootm.c | 1 - 1 file changed, 1 deletion(-) -- 1.8.2.3