diff options
| author | Ilya Yanok <yanok@emcraft.com> | 2008-12-11 05:51:57 +0300 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:14:54 +0100 |
| commit | 584eedab66d0828f2d571a24b10526c4e65f547b (patch) | |
| tree | 1efa8c24563643062006e1ba6986a97ed30f3825 | |
| parent | b1ffecec37b57a59c139042267faac458e5324e9 (diff) | |
| download | olio-uboot-2014.01-584eedab66d0828f2d571a24b10526c4e65f547b.tar.xz olio-uboot-2014.01-584eedab66d0828f2d571a24b10526c4e65f547b.zip | |
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: Ilya Yanok <yanok@emcraft.com>
Acked-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index be7c1a190..11b66ab4b 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -119,6 +119,7 @@ #include <watchdog.h> #include <jffs2/jffs2.h> #include <jffs2/jffs2_1pass.h> +#include <linux/mtd/compat.h> #include "jffs2_private.h" @@ -1408,11 +1409,6 @@ dump_dirents(struct b_lists *pL) } #endif -#define min_t(type, x, y) ({ \ - type __min1 = (x); \ - type __min2 = (y); \ - __min1 < __min2 ? __min1: __min2; }) - #define DEFAULT_EMPTY_SCAN_SIZE 4096 static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size) |