Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/misc/sti/sti-console.c b/drivers/misc/sti/sti-console.c
index 451a139d46b90462575463773c1a8eac70df6bfb..2062d23dca010344505edb01b001b307d8510276 100644 (file)
--- a/drivers/misc/sti/sti-console.c
+++ b/drivers/misc/sti/sti-console.c
@@ -14,8 +14,8 @@
 #include <linux/module.h>
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
-#include <asm/arch/sti.h>
-#include <asm/arch/board.h>
+#include <mach/sti.h>
+#include <mach/board.h>
 
 #define DRV_NAME "sticon"