Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-davinci / aemif.c

diff --git a/arch/arm/mach-davinci/aemif.c b/arch/arm/mach-davinci/aemif.c
index 9c3f500fc12f3b1aacef4ee26002b6c4e56f1e65..1ce70a91f2e95bc5f6f44dc5d97a85a70f5bf028 100644 (file)
--- a/arch/arm/mach-davinci/aemif.c
+++ b/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;