diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-15 18:55:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-15 18:56:02 +0100 |
| commit | 0181b61a988424b5cc44fe09e6968142359c815e (patch) | |
| tree | 2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5 /arch/arm/Kconfig | |
| parent | 92633b72d18ca4f25de1f28e436a882159491e7e (diff) | |
| parent | 87944f3361fc033b73617aa663135c6e468957a7 (diff) | |
| download | linux-0181b61a988424b5cc44fe09e6968142359c815e.tar.gz | |
Merge branch 'pxa' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fcd1d8f95a21..0a0c88d0039c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -339,14 +339,14 @@ config ARCH_PNX4008 This enables support for Philips PNX4008 mobile platform. config ARCH_PXA - bool "PXA2xx-based" + bool "PXA2xx/PXA3xx-based" depends on MMU select ARCH_MTD_XIP select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS help - Support for Intel's PXA2XX processor line. + Support for Intel/Marvell's PXA2xx/PXA3xx processor line. config ARCH_RPC bool "RiscPC" @@ -489,7 +489,7 @@ source arch/arm/mm/Kconfig config IWMMXT bool "Enable iWMMXt support" depends on CPU_XSCALE || CPU_XSC3 - default y if PXA27x + default y if PXA27x || PXA3xx help Enable support for iWMMXt context switching at run time if running on a CPU that supports it. |