From 53936c56dcaf1db818fe953ae05592a8b5e345b5 Mon Sep 17 00:00:00 2001
From: Alexander Clouter <alex@digriz.org.uk>
Date: Sat, 5 Mar 2011 11:31:04 +0000
Subject: [PATCH] ARM: orion5x: fix compiler cast warnings in ts78xx-setup.c

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
[np: used min_t() as suggested by Sergei Shtylyov <sshtylyov@mvista.com>]
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
---
 arch/arm/mach-orion5x/ts78xx-setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 3f2e1cdf11f6..8554707d20a9 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -200,7 +200,7 @@ static void ts78xx_ts_nand_write_buf(struct mtd_info *mtd,
 	int sz;
 
 	if (off) {
-		sz = min(4 - off, len);
+		sz = min_t(int, 4 - off, len);
 		writesb(io_base, buf, sz);
 		buf += sz;
 		len -= sz;
@@ -227,7 +227,7 @@ static void ts78xx_ts_nand_read_buf(struct mtd_info *mtd,
 	int sz;
 
 	if (off) {
-		sz = min(4 - off, len);
+		sz = min_t(int, 4 - off, len);
 		readsb(io_base, buf, sz);
 		buf += sz;
 		len -= sz;