ARM: msm: Move mach/board.h contents to common.h

The contents of mach/board.h are only used by files within
mach-msm so there is no need to export this file outside of the
mach-msm directory. Move the contents of the file to common.h to
allow us to compile MSM in the multi-platform kernel.

Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: David Brown <davidb@codeaurora.org>

diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c
index 95f9cae..c294689 100644 (file)
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -17,7 +17,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/board.h>
 #include "common.h"
 
 static void __init msm8x60_init_late(void)

diff --cc arch/arm/mach-msm/board-halibut.c
Simple merge

diff --cc arch/arm/mach-msm/board-mahimahi.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x30.c
Simple merge

diff --cc arch/arm/mach-msm/board-qsd8x50.c
Simple merge

diff --cc arch/arm/mach-msm/board-sapphire.c
Simple merge

diff --cc arch/arm/mach-msm/board-trout.c
Simple merge

diff --cc arch/arm/mach-msm/board-trout.h
Simple merge

diff --cc arch/arm/mach-msm/common.h
Simple merge

diff --cc arch/arm/mach-msm/devices-msm7x30.c
Simple merge

diff --cc arch/arm/mach-msm/devices-qsd8x50.c
Simple merge

diff --cc arch/arm/mach-msm/include/mach/board.h
Simple merge

diff --cc arch/arm/mach-msm/io.c
Simple merge

diff --cc drivers/video/msm/msm_fb.c
Simple merge