From c0e2c526578aff5e531a9afa765c7900ba6e5c34 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Wed, 18 Feb 2009 10:26:20 +0200
Subject: UBI: update ubi-header.h

Take the latest version from the kernel, where it was renamed
to ubi-media.h.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 ubi-utils/inc/libubi.h               | 2 +-
 ubi-utils/new-utils/include/libubi.h | 2 +-
 ubi-utils/new-utils/src/libscan.c    | 2 +-
 ubi-utils/new-utils/src/libubigen.c  | 2 +-
 ubi-utils/new-utils/src/ubicrc32.c   | 2 +-
 ubi-utils/new-utils/src/ubinize.c    | 2 +-
 ubi-utils/src/bootenv.c              | 2 +-
 ubi-utils/src/libpfiflash.c          | 2 +-
 ubi-utils/src/libubigen.c            | 2 +-
 ubi-utils/src/mkbootenv.c            | 2 +-
 ubi-utils/src/pddcustomize.c         | 2 +-
 ubi-utils/src/pfi2bin.c              | 2 +-
 ubi-utils/src/ubigen.c               | 2 +-
 ubi-utils/src/ubigen.h               | 2 +-
 ubi-utils/src/ubimirror.c            | 2 +-
 ubi-utils/src/unubi.c                | 2 +-
 ubi-utils/src/unubi_analyze.h        | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'ubi-utils')

diff --git a/ubi-utils/inc/libubi.h b/ubi-utils/inc/libubi.h
index d39c1b9..82824bd 100644
--- a/ubi-utils/inc/libubi.h
+++ b/ubi-utils/inc/libubi.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <mtd/ubi-user.h>
 #include <ctype.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ubi-utils/new-utils/include/libubi.h b/ubi-utils/new-utils/include/libubi.h
index 2eeae03..4308bed 100644
--- a/ubi-utils/new-utils/include/libubi.h
+++ b/ubi-utils/new-utils/include/libubi.h
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <stdint.h>
 #include <mtd/ubi-user.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ubi-utils/new-utils/src/libscan.c b/ubi-utils/new-utils/src/libscan.c
index da13b1b..dc1f083 100644
--- a/ubi-utils/new-utils/src/libscan.c
+++ b/ubi-utils/new-utils/src/libscan.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include <mtd_swab.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 #include <mtd/mtd-user.h>
 #include <libmtd.h>
 #include <libscan.h>
diff --git a/ubi-utils/new-utils/src/libubigen.c b/ubi-utils/new-utils/src/libubigen.c
index 70ef0ca..91bb274 100644
--- a/ubi-utils/new-utils/src/libubigen.c
+++ b/ubi-utils/new-utils/src/libubigen.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 #include <mtd_swab.h>
 #include <libubigen.h>
 #include "crc32.h"
diff --git a/ubi-utils/new-utils/src/ubicrc32.c b/ubi-utils/new-utils/src/ubicrc32.c
index 4f5b32e..d39af10 100644
--- a/ubi-utils/new-utils/src/ubicrc32.c
+++ b/ubi-utils/new-utils/src/ubicrc32.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <unistd.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #include "crc32.h"
 #include "common.h"
diff --git a/ubi-utils/new-utils/src/ubinize.c b/ubi-utils/new-utils/src/ubinize.c
index 00dc508..0762aa8 100644
--- a/ubi-utils/new-utils/src/ubinize.c
+++ b/ubi-utils/new-utils/src/ubinize.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 #include <libubigen.h>
 #include <libiniparser.h>
 #include "common.h"
diff --git a/ubi-utils/src/bootenv.c b/ubi-utils/src/bootenv.c
index fd02bd1..78198fe 100644
--- a/ubi-utils/src/bootenv.c
+++ b/ubi-utils/src/bootenv.c
@@ -30,7 +30,7 @@
 #include "hashmap.h"
 #include "error.h"
 
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 #include "crc32.h"
 
 #define ubi_unused __attribute__((unused))
diff --git a/ubi-utils/src/libpfiflash.c b/ubi-utils/src/libpfiflash.c
index cf18ad3..b0d454a 100644
--- a/ubi-utils/src/libpfiflash.c
+++ b/ubi-utils/src/libpfiflash.c
@@ -52,7 +52,7 @@
 #include "bootenv.h"
 
 /* ubi-header.h and crc32.h needed for CRC checking */
-#include <mtd/ubi-header.h>	/* FIXME Is this ok here? */
+#include <mtd/ubi-media.h>	/* FIXME Is this ok here? */
 #include "crc32.h"
 
 #define ubi_unused __attribute__((unused))
diff --git a/ubi-utils/src/libubigen.c b/ubi-utils/src/libubigen.c
index 1fce3f9..1793009 100644
--- a/ubi-utils/src/libubigen.c
+++ b/ubi-utils/src/libubigen.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 #include <mtd_swab.h>
 
 #include "config.h"
diff --git a/ubi-utils/src/mkbootenv.c b/ubi-utils/src/mkbootenv.c
index 952f651..50fc8ac 100644
--- a/ubi-utils/src/mkbootenv.c
+++ b/ubi-utils/src/mkbootenv.c
@@ -29,7 +29,7 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <errno.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #include "config.h"
 #include "bootenv.h"
diff --git a/ubi-utils/src/pddcustomize.c b/ubi-utils/src/pddcustomize.c
index 859346c..1eb9b9a 100644
--- a/ubi-utils/src/pddcustomize.c
+++ b/ubi-utils/src/pddcustomize.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #include "config.h"
 #include "bootenv.h"
diff --git a/ubi-utils/src/pfi2bin.c b/ubi-utils/src/pfi2bin.c
index a8c76a3..34ecc92 100644
--- a/ubi-utils/src/pfi2bin.c
+++ b/ubi-utils/src/pfi2bin.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 
 #include <ubigen.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 #include <mtd_swab.h>
 
 #include "config.h"
diff --git a/ubi-utils/src/ubigen.c b/ubi-utils/src/ubigen.c
index 9fcafab..bb55fa9 100644
--- a/ubi-utils/src/ubigen.c
+++ b/ubi-utils/src/ubigen.c
@@ -31,7 +31,7 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #include "ubigen.h"
 #include "config.h"
diff --git a/ubi-utils/src/ubigen.h b/ubi-utils/src/ubigen.h
index 0f43a46..8d29120 100644
--- a/ubi-utils/src/ubigen.h
+++ b/ubi-utils/src/ubigen.h
@@ -24,7 +24,7 @@
 
 #include <stdio.h> /* FILE */
 #include <stdint.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ubi-utils/src/ubimirror.c b/ubi-utils/src/ubimirror.c
index a20e1af..da05a8b 100644
--- a/ubi-utils/src/ubimirror.c
+++ b/ubi-utils/src/ubimirror.c
@@ -29,7 +29,7 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <errno.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #include "config.h"
 #include "error.h"
diff --git a/ubi-utils/src/unubi.c b/ubi-utils/src/unubi.c
index 7d65cfc..0f72b18 100644
--- a/ubi-utils/src/unubi.c
+++ b/ubi-utils/src/unubi.c
@@ -49,7 +49,7 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 #include <mtd_swab.h>
 
 #include "crc32.h"
diff --git a/ubi-utils/src/unubi_analyze.h b/ubi-utils/src/unubi_analyze.h
index 8588219..c478f53 100644
--- a/ubi-utils/src/unubi_analyze.h
+++ b/ubi-utils/src/unubi_analyze.h
@@ -48,7 +48,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <mtd/ubi-header.h>
+#include <mtd/ubi-media.h>
 
 #define FN_EH_STAT      "analysis_blocks.txt"
 #define FN_EH_DATA	"analysis_ec_hdr.data"
-- 
cgit v1.2.3