Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/misc/sti/sdti.c b/drivers/misc/sti/sdti.c
index e12fb120bbac4867c17756fd82fe64c6fe927661..c35821d5b4dd75780b8b75bff155f2216fed1642 100644 (file)
--- a/drivers/misc/sti/sdti.c
+++ b/drivers/misc/sti/sdti.c
@@ -16,7 +16,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>
 #include <asm/io.h>