Skip to content
Snippets Groups Projects
Commit 584eedab authored by Ilya Yanok's avatar Ilya Yanok Committed by Wolfgang Denk
Browse files

jffs2: include <linux/mtd/compat.h> instead of defining own min_t


Include <linux/mtd/compat.h> header for min_t definition instead of
providing our own one. Removes warnings in case of OneNAND support
enabled.

Although I thinks it's a bit silly to include <linux/mtd/compat.h>
just for min_t...

Signed-off-by: default avatarIlya Yanok <yanok@emcraft.com>
Acked-by: default avatarStefan Roese <sr@denx.de>
parent b1ffecec
No related branches found
No related tags found
No related merge requests found
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
#include <watchdog.h> #include <watchdog.h>
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
#include <jffs2/jffs2_1pass.h> #include <jffs2/jffs2_1pass.h>
#include <linux/mtd/compat.h>
#include "jffs2_private.h" #include "jffs2_private.h"
...@@ -1408,11 +1409,6 @@ dump_dirents(struct b_lists *pL) ...@@ -1408,11 +1409,6 @@ dump_dirents(struct b_lists *pL)
} }
#endif #endif
#define min_t(type, x, y) ({ \
type __min1 = (x); \
type __min2 = (y); \
__min1 < __min2 ? __min1: __min2; })
#define DEFAULT_EMPTY_SCAN_SIZE 4096 #define DEFAULT_EMPTY_SCAN_SIZE 4096
static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size) static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment