Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/cbus/cbus.c b/drivers/cbus/cbus.c
index eff38be50880e9c8a3e2ee28aec88ce7c4730cd0..289557c4a246030b0086237c8f032dc9dc87c229 100644 (file)
--- a/drivers/cbus/cbus.c
+++ b/drivers/cbus/cbus.c
@@ -29,8 +29,8 @@
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>
+#include <mach/gpio.h>
+#include <mach/board.h>
 
 #include <asm/io.h>