diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-03 22:37:06 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-03 22:37:06 +0100 |
| commit | 941f81c16ec7497ecce6f1f611277d67e89bdfe1 (patch) | |
| tree | 4543aa365058fc52f051ea4881e1dc231f39774c /arch/arm/Kconfig | |
| parent | e220ba60223a9d63e70217e5b112160df8c21cea (diff) | |
| parent | 478ea14466fb524b4cd90cdf0b8845f8c5ee6015 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 355bc5e6e6ea..3806d636a401 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -297,6 +297,15 @@ config ARCH_CLPS711X help Support for Cirrus Logic 711x/721x based boards. +config ARCH_CNS3XXX + bool "Cavium Networks CNS3XXX family" + select CPU_V6 + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + select ARM_GIC + help + Support for Cavium Networks CNS3XXX platform. + config ARCH_GEMINI bool "Cortina Systems Gemini" select CPU_FA526 @@ -818,6 +827,8 @@ source "arch/arm/mach-bcmring/Kconfig" source "arch/arm/mach-clps711x/Kconfig" +source "arch/arm/mach-cns3xxx/Kconfig" + source "arch/arm/mach-davinci/Kconfig" source "arch/arm/mach-dove/Kconfig" |