From: Ilya Yanok <yanok@emcraft.com>
Date: Thu, 11 Dec 2008 02:51:57 +0000 (+0300)
Subject: jffs2: include <linux/mtd/compat.h> instead of defining own min_t
X-Git-Tag: v2009.01-rc1~3^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=584eedab66d0828f2d571a24b10526c4e65f547b;p=oweals%2Fu-boot.git

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>
---

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index be7c1a190b..11b66ab4b3 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)