summaryrefslogtreecommitdiff
path: root/arch/arm/mach-cns3xxx/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-26 09:40:43 +0400
committerDavid S. Miller <davem@davemloft.net>2014-06-26 09:40:43 +0400
commit9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (patch)
treebca8230897630ca6721bdd7b959142984afa256a /arch/arm/mach-cns3xxx/Kconfig
parent644a918d20336a7deaa81f675c3c2f25bf3dafbb (diff)
parentd7933ab727ed035bdf420d7381b831ba959cecc5 (diff)
downloadlinux-9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/mach-cns3xxx/Kconfig')
-rw-r--r--arch/arm/mach-cns3xxx/Kconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
index 66838f42037f..3c22a1990ecd 100644
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -1,12 +1,11 @@
-config ARCH_CNS3XXX
+menuconfig ARCH_CNS3XXX
bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
select ARM_GIC
select PCI_DOMAINS if PCI
help
Support for Cavium Networks CNS3XXX platform.
-menu "CNS3XXX platform type"
- depends on ARCH_CNS3XXX
+if ARCH_CNS3XXX
config MACH_CNS3420VB
bool "Support for CNS3420 Validation Board"
@@ -17,4 +16,4 @@ config MACH_CNS3420VB
This is a platform with an on-board ARM11 MPCore and has support
for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
-endmenu
+endif