aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
commit64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch)
treea434977a6caa9b41cc0daaf71dbd76ac8693aba6 /arch/arm/Kconfig
parentb93a4afcff7be859e30cad2a305731516057d6cf (diff)
parent17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff)
downloadlinux-2.6.34-ux500-64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7ac8386c700..ee74c3a0388 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -583,6 +583,11 @@ config ARCH_MSM
interface to the ARM9 modem processor which runs the baseband stack
and controls some vital subsystems (clock and power control, etc).
+config ARCH_SHMOBILE
+ bool "Renesas SH-Mobile"
+ help
+ Support for Renesas's SH-Mobile ARM platforms
+
config ARCH_RPC
bool "RiscPC"
select ARCH_ACORN
@@ -832,6 +837,8 @@ endif
source "arch/arm/mach-s5p6440/Kconfig"
+source "arch/arm/mach-shmobile/Kconfig"
+
source "arch/arm/plat-stmp3xxx/Kconfig"
if ARCH_S5PC1XX