Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / misc / sti / sti.c

diff --git a/drivers/misc/sti/sti.c b/drivers/misc/sti/sti.c
index e828860f037e67dc2cc340efe0a8c387f7f905a9..28fac623313658ce6c42ed131626caa708d99d39 100644 (file)
--- a/drivers/misc/sti/sti.c
+++ b/drivers/misc/sti/sti.c
@@ -22,7 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <asm/arch/sti.h>
+#include <mach/sti.h>
 #include <asm/byteorder.h>
 
 static struct clk *sti_ck;
@@ -356,7 +356,7 @@ static int __devinit sti_probe(struct platform_device *pdev)
        if (unlikely(ret != 0))
                goto err;
 
-       sti_base = res->start;
+       sti_base = io_p2v(res->start);
 
        /*
         * OMAP 16xx keeps channels in a relatively sane location,
@@ -364,7 +364,7 @@ static int __devinit sti_probe(struct platform_device *pdev)
         * remapped.
         */
        if (cpu_is_omap16xx())
-               sti_channel_base = cres->start;
+               sti_channel_base = io_p2v(cres->start);
        else if (cpu_is_omap24xx()) {
                unsigned int size = cres->end - cres->start;