Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/misc/sti/sti-fifo.c b/drivers/misc/sti/sti-fifo.c
index 4069d9b2d3905a22fb1a3b9ecc3bc1e5786d54ab..1ea5b1896fb29decd1f5f7e1c1d093b6a0949274 100644 (file)
--- a/drivers/misc/sti/sti-fifo.c
+++ b/drivers/misc/sti/sti-fifo.c
@@ -13,7 +13,7 @@
 #include <linux/interrupt.h>
 #include <linux/err.h>
 #include <linux/module.h>
-#include <asm/arch/sti.h>
+#include <mach/sti.h>
 
 #define STI_READ_BUFFER_SIZE   1024
 #define sti_buf_pos(pos)       ((sti_crb->bufpos + (pos)) % \