Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / bci.c

diff --git a/arch/arm/mach-omap2/bci.c b/arch/arm/mach-omap2/bci.c
index 2bd71d525ad686fe8bb80210f8680df790c76d97..9b9f9d20412e860727395cf198b7ea6101e6176e 100644 (file)
--- a/arch/arm/mach-omap2/bci.c
+++ b/arch/arm/mach-omap2/bci.c
@@ -13,7 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <asm/arch/bci.h>
+#include <mach/bci.h>
 
 #if defined(CONFIG_TWL4030_BCI_BATTERY) || \
        defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)