]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
jffs2: include <linux/mtd/compat.h> instead of defining own min_t
authorIlya Yanok <yanok@emcraft.com>
Thu, 11 Dec 2008 02:51:57 +0000 (05:51 +0300)
committerWolfgang Denk <wd@denx.de>
Tue, 16 Dec 2008 16:14:54 +0000 (17:14 +0100)
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>
fs/jffs2/jffs2_1pass.c

index be7c1a190b51a1c9aba5001886158fafae74df39..11b66ab4b30847dc6b4f28ef9d72fb1cda7dc0a2 100644 (file)
 #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)