2 files changed, 14 insertions, 1 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 75b8c3d26068..e0db899d118a 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -41,7 +41,7 @@ config ARCH_MSM8X60
         select CPU_V7
         select MSM_V2_TLMM
         select MSM_GPIOMUX
-        select MACH_MSM8X60_RUMI3 if (!MACH_MSM8X60_RUMI3)
+        select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3)
 
 endchoice
 
@@ -100,6 +100,12 @@ config MACH_MSM8X60_RUMI3
         help
           Support for the Qualcomm MSM8x60 RUMI3 emulator.
 
+config MACH_MSM8X60_SURF
+        depends on ARCH_MSM8X60
+        bool "MSM8x60 SURF"
+        help
+          Support for the Qualcomm MSM8x60 SURF eval board.
+
 endmenu
 
 config MSM_DEBUG_UART
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 70087cad6731..a8a4d8d0ae31 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -76,3 +76,10 @@ MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3")
         .init_machine = msm8x60_init,
         .timer = &msm_timer,
 MACHINE_END
+
+MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF")
+        .map_io = msm8x60_map_io,
+        .init_irq = msm8x60_init_irq,
+        .init_machine = msm8x60_init,
+        .timer = &msm_timer,
+MACHINE_END