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 1140fed048fedb9f636f8940a3de4d93d0bbdb08..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;