Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/bluetooth/brf6150.h b/drivers/bluetooth/brf6150.h
index 334a72e5908f00f0d6c972d633478c9357a763f5..e8b29880e9fb517ea011cea1b1f8c123df715da3 100644 (file)
--- a/drivers/bluetooth/brf6150.h
+++ b/drivers/bluetooth/brf6150.h
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #ifndef __DRIVERS_BLUETOOTH_BRF6150_H
 #define __DRIVERS_BLUETOOTH_BRF6150_H