summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-09-19 11:00:02 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-09-19 11:00:02 +0100
commitaa3090005d27f3c7fba915ccea36b97b669fa3ab (patch)
treee4de079bac5b51b1e1cfacc5393006b857045444 /arch/arm/Kconfig
parent151b6a5f1d4c547c92ec67a5a6fedc16f435956e (diff)
parent448352ae72ef1760c19631a728a3791c1efc52f2 (diff)
downloadop-kernel-dev-aa3090005d27f3c7fba915ccea36b97b669fa3ab.zip
op-kernel-dev-aa3090005d27f3c7fba915ccea36b97b669fa3ab.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 553b7cf..8d39535 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -748,6 +748,15 @@ config ARCH_SHARK
Support for the StrongARM based Digital DNARD machine, also known
as "Shark" (<http://www.shark-linux.de/shark.html>).
+config ARCH_TCC_926
+ bool "Telechips TCC ARM926-based systems"
+ select CPU_ARM926T
+ select HAVE_CLK
+ select COMMON_CLKDEV
+ select GENERIC_CLOCKEVENTS
+ help
+ Support for Telechips TCC ARM926-based systems.
+
config ARCH_LH7A40X
bool "Sharp LH7A40X"
select CPU_ARM922T
@@ -916,6 +925,8 @@ source "arch/arm/plat-s5p/Kconfig"
source "arch/arm/plat-spear/Kconfig"
+source "arch/arm/plat-tcc/Kconfig"
+
if ARCH_S3C2410
source "arch/arm/mach-s3c2400/Kconfig"
source "arch/arm/mach-s3c2410/Kconfig"
OpenPOWER on IntegriCloud