Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

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

diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
index 3c22a1990ecd0ff2830dcb8bdf6b33a88685bda7..eb14a0ff0093848faee161b9f7ae5749e1b3ae86 100644 (file)
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -1,5 +1,6 @@
 menuconfig ARCH_CNS3XXX
-       bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
+       bool "Cavium Networks CNS3XXX family"
+       depends on ARCH_MULTI_V6
        select ARM_GIC
        select PCI_DOMAINS if PCI
        help