Merge tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux into next...

[karo-tx-linux.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 583f4a00ec3210bf6cb3cf58dac4ae7ac8a2807c..15337833d05d4580005edb879d0dde262b7c4f1b 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -777,6 +777,11 @@ config DEBUG_LL_INCLUDE
                                 DEBUG_IMX6SL_UART
        default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
                                      DEBUG_KEYSTONE_UART1
+       default "debug/msm.S" if DEBUG_MSM_UART1 || \
+                                DEBUG_MSM_UART2 || \
+                                DEBUG_MSM_UART3 || \
+                                DEBUG_MSM8660_UART || \
+                                DEBUG_MSM8960_UART
        default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
                                   DEBUG_MVEBU_UART_ALTERNATE
        default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
@@ -804,7 +809,7 @@ config DEBUG_LL_INCLUDE
 
 config DEBUG_UNCOMPRESS
        bool
-       depends on ARCH_MULTIPLATFORM
+       depends on ARCH_MULTIPLATFORM || ARCH_MSM
        default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
                     !DEBUG_TEGRA_UART
        help
@@ -820,7 +825,7 @@ config DEBUG_UNCOMPRESS
 
 config UNCOMPRESS_INCLUDE
        string
-       default "debug/uncompress.h" if ARCH_MULTIPLATFORM
+       default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM
        default "mach/uncompress.h"
 
 config EARLY_PRINTK