From 92a74f1c1c9ca4d8009bfdea1c5febb7c0674f15 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Sat, 16 Feb 2008 15:42:52 +0200 Subject: [PATCH] UBI: make ubi-header.h local The new trend in linux is not to store headers which define on-media format in the include/ directory, but instead, store them locally. This is because these headers "do not define any kernel<->userspace interface". Do so for UBI as well. Signed-off-by: Artem Bityutskiy --- include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 ++++---- drivers/mtd/ubi/ubi.h | 3 +-- include/mtd/Kbuild | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) diff --git a/include/mtd/ubi-header.h b/drivers/mtd/ubi/ubi-media.h similarity index 99% rename from include/mtd/ubi-header.h rename to drivers/mtd/ubi/ubi-media.h index 292f916..c3185d9 100644 --- a/include/mtd/ubi-header.h +++ b/drivers/mtd/ubi/ubi-media.h @@ -24,11 +24,11 @@ /* * This file defines the layout of UBI headers and all the other UBI on-flash - * data structures. May be included by user-space. + * data structures. */ -#ifndef __UBI_HEADER_H__ -#define __UBI_HEADER_H__ +#ifndef __UBI_MEDIA_H__ +#define __UBI_MEDIA_H__ #include @@ -369,4 +369,4 @@ struct ubi_vtbl_record { __be32 crc; } __attribute__ ((packed)); -#endif /* !__UBI_HEADER_H__ */ +#endif /* !__UBI_MEDIA_H__ */ diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index a548c1d..28de80f 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h @@ -37,10 +37,9 @@ #include #include #include - -#include #include +#include "ubi-media.h" #include "scan.h" #include "debug.h" diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild index 4d46b3b..8eb018f 100644 --- a/include/mtd/Kbuild +++ b/include/mtd/Kbuild @@ -3,5 +3,4 @@ header-y += jffs2-user.h header-y += mtd-abi.h header-y += mtd-user.h header-y += nftl-user.h -header-y += ubi-header.h header-y += ubi-user.h -- 1.8.2.3