From: Yegor Yefremov <yegorslists@xxxxxxxxxxxxxx> Remove macros, that were already defined in linux/stat.h. Signed-off-by: Yegor Yefremov <yegorslists@xxxxxxxxxxxxxx> --- fs/ubifs/ubifs.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index d16f780..b603c5d 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -36,6 +36,7 @@ #include <lzo.h> #include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/stat.h> #include <linux/ctype.h> #include <linux/math64.h> #include <linux/rbtree.h> @@ -227,20 +228,6 @@ struct file { #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */ #define S_PRIVATE 512 /* Inode is fs-internal */ -/* include/linux/stat.h */ - -#define S_IFMT 00170000 -#define S_IFSOCK 0140000 -#define S_IFLNK 0120000 -#define S_IFREG 0100000 -#define S_IFBLK 0060000 -#define S_IFDIR 0040000 -#define S_IFCHR 0020000 -#define S_IFIFO 0010000 -#define S_ISUID 0004000 -#define S_ISGID 0002000 -#define S_ISVTX 0001000 - /* include/linux/fs.h */ /* -- 2.1.4 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox