Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / cbus / tahvo.c

diff --git a/drivers/cbus/tahvo.c b/drivers/cbus/tahvo.c
index bc7a4b6c69ad253e463ed8a658efc0cb702a88e0..5876b684662eda7bc5f53659fc12502e0a4ab305 100644 (file)
--- a/drivers/cbus/tahvo.c
+++ b/drivers/cbus/tahvo.c
@@ -38,9 +38,9 @@
 
 #include <asm/uaccess.h>
 
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
+#include <mach/board.h>
 
 #include "cbus.h"
 #include "tahvo.h"