Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / arm / mach-orion5x / ts78xx-setup.c

diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 3f2e1cd..8554707 100644 (file)
--- 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;