Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92a74f1c authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

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: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent a4f0fcdf

include/mtd/ubi-header.h→drivers/mtd/ubi/ubi-media.h

+4 −4
Original line number Diff line number Diff line
@@ -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 <asm/byteorder.h>
@@ -369,4 +369,4 @@ struct ubi_vtbl_record { 
	__be32  crc;

} __attribute__ ((packed));



#endif /* !__UBI_HEADER_H__ */
 
#endif /* !__UBI_MEDIA_H__ */

drivers/mtd/ubi/ubi.h

+1 −2
Original line number Diff line number Diff line
@@ -37,10 +37,9 @@ 
#include <linux/string.h>

#include <linux/vmalloc.h>

#include <linux/mtd/mtd.h>



#include <mtd/ubi-header.h>

#include <linux/mtd/ubi.h>



#include "ubi-media.h"

#include "scan.h"

#include "debug.h"

include/mtd/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -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