diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-03 00:31:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-03 00:31:07 +0100 |
| commit | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch) | |
| tree | a434977a6caa9b41cc0daaf71dbd76ac8693aba6 /arch/arm/Kconfig | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
| parent | ARM: mach-shmobile: ap4evb: Add KEYSC support (diff) | |
| download | linux-64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39.tar.xz linux-64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39.zip | |
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/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7ac8386c700c..ee74c3a03883 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 |