aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-orion5x/ts78xx-setup.c4
1 files 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,
200 int sz; 200 int sz;
201 201
202 if (off) { 202 if (off) {
203 sz = min(4 - off, len); 203 sz = min_t(int, 4 - off, len);
204 writesb(io_base, buf, sz); 204 writesb(io_base, buf, sz);
205 buf += sz; 205 buf += sz;
206 len -= sz; 206 len -= sz;
@@ -227,7 +227,7 @@ static void ts78xx_ts_nand_read_buf(struct mtd_info *mtd,
227 int sz; 227 int sz;
228 228
229 if (off) { 229 if (off) {
230 sz = min(4 - off, len); 230 sz = min_t(int, 4 - off, len);
231 readsb(io_base, buf, sz); 231 readsb(io_base, buf, sz);
232 buf += sz; 232 buf += sz;
233 len -= sz; 233 len -= sz;