ARM: use "depends on" for SoC configs instead of "if" after prompt

[deliverable/linux.git] / arch / arm / mach-hisi / Kconfig

diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index 83061ad0e28232cfe227d21ccf3c8905f2b909b3..a3b091a4d344a43d2a903b5ffaaa672bf742db4a 100644 (file)
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -13,7 +13,8 @@ if ARCH_HISI
 menu "Hisilicon platform type"
 
 config ARCH_HI3xxx
-       bool "Hisilicon Hi36xx family" if ARCH_MULTI_V7
+       bool "Hisilicon Hi36xx family"
+       depends on ARCH_MULTI_V7
        select CACHE_L2X0
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
@@ -23,7 +24,8 @@ config ARCH_HI3xxx
          Support for Hisilicon Hi36xx SoC family
 
 config ARCH_HIP01
-       bool "Hisilicon HIP01 family" if ARCH_MULTI_V7
+       bool "Hisilicon HIP01 family"
+       depends on ARCH_MULTI_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select ARM_GLOBAL_TIMER
@@ -31,7 +33,8 @@ config ARCH_HIP01
          Support for Hisilicon HIP01 SoC family
 
 config ARCH_HIP04
-       bool "Hisilicon HiP04 Cortex A15 family" if ARCH_MULTI_V7
+       bool "Hisilicon HiP04 Cortex A15 family"
+       depends on ARCH_MULTI_V7
        select ARM_ERRATA_798181 if SMP
        select HAVE_ARM_ARCH_TIMER
        select MCPM if SMP
@@ -40,7 +43,8 @@ config ARCH_HIP04
          Support for Hisilicon HiP04 SoC family
 
 config ARCH_HIX5HD2
-       bool "Hisilicon X5HD2 family" if ARCH_MULTI_V7
+       bool "Hisilicon X5HD2 family"
+       depends on ARCH_MULTI_V7
        select CACHE_L2X0
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP