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

[pandora-kernel.git] / arch / arm / mach-davinci / sram.c

diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c
index db54b2a..4f1fc9b 100644 (file)
--- a/arch/arm/mach-davinci/sram.c
+++ b/arch/arm/mach-davinci/sram.c
@@ -60,7 +60,7 @@ static int __init sram_init(void)
        int status = 0;
 
        if (len) {
-               len = min(len, SRAM_SIZE);
+               len = min_t(unsigned, len, SRAM_SIZE);
                sram_pool = gen_pool_create(ilog2(SRAM_GRANULARITY), -1);
                if (!sram_pool)
                        status = -ENOMEM;