aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-14 11:01:44 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-14 11:01:44 +0100
commitb7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch)
treec65b81ef9ae5076d2137034accfa2610f45a13de /arch/arm/Kconfig
parent06099961002a813324d057a91695af7c72939da6 (diff)
parent7666c17e2b0986a079da46122d8658544416c2cf (diff)
downloadkernel_samsung_smdk4412-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.zip
kernel_samsung_smdk4412-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.gz
kernel_samsung_smdk4412-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.bz2
Merge branch 'u300' into devel
Conflicts: arch/arm/Makefile Updates: arch/arm/mach-u300/core.c arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fee7c64..2947510 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -598,6 +598,20 @@ config ARCH_LH7A40X
core with a wide array of integrated devices for
hand-held and low-power applications.
+config ARCH_U300
+ bool "ST-Ericsson U300 Series"
+ depends on MMU
+ select CPU_ARM926T
+ select ARM_AMBA
+ select ARM_VIC
+ select GENERIC_TIME
+ select GENERIC_CLOCKEVENTS
+ select HAVE_CLK
+ select COMMON_CLKDEV
+ select GENERIC_GPIO
+ help
+ Support for ST-Ericsson U300 series mobile platforms.
+
config ARCH_DAVINCI
bool "TI DaVinci"
select CPU_ARM926T
@@ -712,6 +726,8 @@ source "arch/arm/mach-ks8695/Kconfig"
source "arch/arm/mach-msm/Kconfig"
+source "arch/arm/mach-u300/Kconfig"
+
source "arch/arm/mach-w90x900/Kconfig"
# Definitions to make life easier