diff --git a/[refs] b/[refs]
index 602277a35dec..2c6ebb86ea9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a07bfb5215e11227403f121097ed72187dc3241
+refs/heads/master: 12cdd3d71954c2cd6dd556eec25dd7d346735831
diff --git a/trunk/arch/arm/mach-davinci/aemif.c b/trunk/arch/arm/mach-davinci/aemif.c
index 9c3f500fc12f..1ce70a91f2e9 100644
--- a/trunk/arch/arm/mach-davinci/aemif.c
+++ b/trunk/arch/arm/mach-davinci/aemif.c
@@ -90,7 +90,7 @@ int davinci_aemif_setup_timing(struct davinci_aemif_timing *t,
 					void __iomem *base, unsigned cs)
 {
 	unsigned set, val;
-	unsigned ta, rhold, rstrobe, rsetup, whold, wstrobe, wsetup;
+	int ta, rhold, rstrobe, rsetup, whold, wstrobe, wsetup;
 	unsigned offset = A1CR_OFFSET + cs * 4;
 	struct clk *aemif_clk;
 	unsigned long clkrate;