Merge tag 'metag-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[~andy/linux] / arch / arm / mach-msm / io.c

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index af550af43f892c39850bbc5a4925c043c94320a3..adc8971c726640444d3fa7e14decd81ccac4d750 100644 (file)
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/bug.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/export.h>
@@ -27,8 +28,6 @@
 #include <mach/msm_iomap.h>
 #include <asm/mach/map.h>
 
-#include <mach/board.h>
-
 #include "common.h"
 
 #define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) {                         \