Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800-bt.c

diff --git a/arch/arm/mach-omap2/board-n800-bt.c b/arch/arm/mach-omap2/board-n800-bt.c
index 4ea19cca83f991a654d92bd8a003f8baab86cc50..61afd2b2878e8b13dd1f443aad3d1f7de222f63b 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-bt.c
+++ b/arch/arm/mach-omap2/board-n800-bt.c
@@ -21,7 +21,7 @@
 
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 static struct platform_device n800_bt_device = {
        .name           = "hci_h4p",