From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Date: Thu, 30 Oct 2014 07:55:51 +0000 (+0200)
Subject: Move mkfs.ubifs/ubifs-media.h to include/mtd
X-Git-Tag: v1.5.2~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=789d2d7019da3d74670e4cfc137f11a1065ef748;p=mtd-utils.git

Move mkfs.ubifs/ubifs-media.h to include/mtd

This file will be shared with the ubidump tool in the future.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---

diff --git a/mkfs.ubifs/ubifs-media.h b/include/mtd/ubifs-media.h
similarity index 100%
rename from mkfs.ubifs/ubifs-media.h
rename to include/mtd/ubifs-media.h
diff --git a/mkfs.ubifs/README b/mkfs.ubifs/README
index 4fbaa7d..7e19939 100644
--- a/mkfs.ubifs/README
+++ b/mkfs.ubifs/README
@@ -2,7 +2,6 @@ UBIFS File System - Make File System program
 
 * crc16.h and crc16.c were copied from the linux kernel.
 * crc32.h and crc32.c were copied from mtd-utils and amended.
-* ubifs-media.h is fs/ubifs/ubifs-media.h from the linux kernel
 * ubifs.h is a selection of definitions from fs/ubifs/ubifs.h from the linux kernel.
 * key.h is copied from fs/ubifs/key.h from the linux kernel.
 * defs.h is a bunch of definitions to smooth things over.
diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
index 4152b6a..34b2f60 100644
--- a/mkfs.ubifs/compr.c
+++ b/mkfs.ubifs/compr.c
@@ -32,7 +32,6 @@
 #undef crc32
 
 #include "compr.h"
-#include "ubifs-media.h"
 #include "mkfs.ubifs.h"
 
 static void *lzo_mem;
diff --git a/mkfs.ubifs/mkfs.ubifs.h b/mkfs.ubifs/mkfs.ubifs.h
index 3edb79d..944a159 100644
--- a/mkfs.ubifs/mkfs.ubifs.h
+++ b/mkfs.ubifs/mkfs.ubifs.h
@@ -46,6 +46,8 @@
 #include <uuid/uuid.h>
 #include <sys/file.h>
 
+#include <mtd/ubifs-media.h>
+
 /* common.h requires the PROGRAM_NAME macro */
 #define PROGRAM_NAME "mkfs.ubifs"
 #include "common.h"
@@ -53,7 +55,6 @@
 #include "libubi.h"
 #include "defs.h"
 #include "crc16.h"
-#include "ubifs-media.h"
 #include "ubifs.h"
 #include "key.h"
 #include "lpt.h"