public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] Revert "lib: bootm: add missing include"
@ 2014-11-11 14:45 Michal Simek
  2014-11-11 20:49 ` Tom Rini
  0 siblings, 1 reply; 2+ messages in thread
From: Michal Simek @ 2014-11-11 14:45 UTC (permalink / raw)
  To: u-boot

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(-)

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>
--
1.8.2.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141111/d8709129/attachment.pgp>

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] Revert "lib: bootm: add missing include"
  2014-11-11 14:45 [U-Boot] [PATCH] Revert "lib: bootm: add missing include" Michal Simek
@ 2014-11-11 20:49 ` Tom Rini
  0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2014-11-11 20:49 UTC (permalink / raw)
  To: u-boot

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!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141111/bcf4f9d3/attachment.pgp>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-11-11 20:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-11 14:45 [U-Boot] [PATCH] Revert "lib: bootm: add missing include" Michal Simek
2014-11-11 20:49 ` Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox