1 files changed, 30 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index d140abca690a..f780086befd7 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -3,6 +3,30 @@ if ARCH_MSM
 comment "MSM Board Type"
         depends on ARCH_MSM
 
+config MSM_DEBUG_UART
+        int
+        default 1 if MSM_DEBUG_UART1
+        default 2 if MSM_DEBUG_UART2
+        default 3 if MSM_DEBUG_UART3
+
+choice
+        prompt "Debug UART"
+
+        default MSM_DEBUG_UART_NONE
+
+        config MSM_DEBUG_UART_NONE
+                bool "None"
+
+        config MSM_DEBUG_UART1
+                bool "UART1"
+
+        config MSM_DEBUG_UART2
+                bool "UART2"
+
+        config MSM_DEBUG_UART3
+                bool "UART3"
+endchoice
+
 config MACH_HALIBUT
         depends on ARCH_MSM
         default y
@@ -10,4 +34,10 @@ config MACH_HALIBUT
         help
           Support for the Qualcomm SURF7201A eval board.
 
+config MACH_TROUT
+        default y
+        bool "HTC Dream (aka trout)"
+        help
+          Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
+
 endif