Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[cascardo/linux.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 771d518..0c12ffb 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -810,12 +810,11 @@ choice
                  via SCIF2 on Renesas R-Car E2 (R8A7794).
 
        config DEBUG_RMOBILE_SCIFA0
-               bool "Kernel low-level debugging messages via SCIFA0 on R8A73A4/SH7372"
-               depends on ARCH_R8A73A4 || ARCH_SH7372
+               bool "Kernel low-level debugging messages via SCIFA0 on R8A73A4"
+               depends on ARCH_R8A73A4
                help
                  Say Y here if you want kernel low-level debugging support
-                 via SCIFA0 on Renesas R-Mobile APE6 (R8A73A4) or SH-Mobile
-                 AP4 (SH7372).
+                 via SCIFA0 on Renesas R-Mobile APE6 (R8A73A4).
 
        config DEBUG_RMOBILE_SCIFA1
                bool "Kernel low-level debugging messages via SCIFA1 on R8A7740"
@@ -1562,7 +1561,8 @@ config DEBUG_UNCOMPRESS
 config UNCOMPRESS_INCLUDE
        string
        default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
-                                       PLAT_SAMSUNG || ARCH_EFM32
+                                       PLAT_SAMSUNG || ARCH_EFM32 || \
+                                       ARCH_SHMOBILE_LEGACY
        default "mach/uncompress.h"
 
 config EARLY_PRINTK