[U-Boot] [PATCH/next v3 06/28] Rename include/bzlib.h to include/u-boot/bzlib.h

[Peter Tyser]

Some systems have bzlib.h installed in /usr/include/.  This isn't the
desired file (we want the one in include/bzlib.h).  Moving U-Boot's
bzlib.h to include/u-boot/ avoids this conflict.

Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
---
 board/mpl/common/common_util.c |    2 +-
 common/cmd_bootm.c             |    2 +-
 include/{ => u-boot}/bzlib.h   |    0
 lib_generic/bzlib_private.h    |    2 +-
 lib_m68k/bootm.c               |    2 +-
 lib_ppc/bootm.c                |    2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/{ => u-boot}/bzlib.h (100%)

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index d169391..c87a248 100644
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -32,7 +32,7 @@
 #include <devices.h>
 #include <pci.h>
 #include <malloc.h>
-#include <bzlib.h>
+#include <u-boot/bzlib.h>
 
 #ifdef CONFIG_PIP405
 #include "../pip405/pip405.h"
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index bd1813a..e66e5d2 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -31,7 +31,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <u-boot/zlib.h>
-#include <bzlib.h>
+#include <u-boot/bzlib.h>
 #include <environment.h>
 #include <lmb.h>
 #include <linux/ctype.h>
diff --git a/include/bzlib.h b/include/u-boot/bzlib.h
similarity index 100%
rename from include/bzlib.h
rename to include/u-boot/bzlib.h
diff --git a/lib_generic/bzlib_private.h b/lib_generic/bzlib_private.h
index 87d8f94..3414dbe 100644
--- a/lib_generic/bzlib_private.h
+++ b/lib_generic/bzlib_private.h
@@ -68,7 +68,7 @@
 
 #include <malloc.h>
 
-#include "bzlib.h"
+#include "u-boot/bzlib.h"
 
 #ifndef BZ_NO_STDIO
 #include <stdio.h>
diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index e5ed6eb..c858cc4 100755
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -25,7 +25,7 @@
 #include <command.h>
 #include <image.h>
 #include <u-boot/zlib.h>
-#include <bzlib.h>
+#include <u-boot/bzlib.h>
 #include <watchdog.h>
 #include <environment.h>
 #include <asm/byteorder.h>
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 0d702bf..9a846c8 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -30,7 +30,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <u-boot/zlib.h>
-#include <bzlib.h>
+#include <u-boot/bzlib.h>
 #include <environment.h>
 #include <asm/byteorder.h>
 
-- 
1.6.0.2.GIT