Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/bluetooth/brf6150.c b/drivers/bluetooth/brf6150.c
index ccb7f089d1b63e44ccb60e8b1990ec976069f89a..f47b22fd7d0aad6562b69a8d8e1fae525a71d302 100644 (file)
--- a/drivers/bluetooth/brf6150.c
+++ b/drivers/bluetooth/brf6150.c
@@ -34,10 +34,10 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/board.h>
-#include <asm/arch/irqs.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
+#include <mach/board.h>
+#include <mach/irqs.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>