Merge tag '3.9-rc3-smp-6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabe...

[~andy/linux] / arch / arm / mach-cns3xxx / Kconfig

diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
index 9ebfcc46feb1a0f115970cfd53805cc117de57f5..dbf0df8bb0acf916624a2eeef6eb12ab86d9f6a1 100644 (file)
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -1,8 +1,20 @@
+config ARCH_CNS3XXX
+       bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
+       select ARM_GIC
+       select CPU_V6K
+       select GENERIC_CLOCKEVENTS
+       select MIGHT_HAVE_CACHE_L2X0
+       select MIGHT_HAVE_PCI
+       select PCI_DOMAINS if PCI
+       help
+         Support for Cavium Networks CNS3XXX platform.
+
 menu "CNS3XXX platform type"
        depends on ARCH_CNS3XXX
 
 config MACH_CNS3420VB
        bool "Support for CNS3420 Validation Board"
+       depends on ATAGS
        help
          Include support for the Cavium Networks CNS3420 MPCore Platform
          Baseboard.