diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-15 13:55:44 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-15 13:56:02 -0400 |
| commit | 0181b61a988424b5cc44fe09e6968142359c815e (patch) | |
| tree | 2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5 /arch/arm/Kconfig | |
| parent | 92633b72d18ca4f25de1f28e436a882159491e7e (diff) | |
| parent | 87944f3361fc033b73617aa663135c6e468957a7 (diff) | |
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 | |||
| 339 | This enables support for Philips PNX4008 mobile platform. | 339 | This enables support for Philips PNX4008 mobile platform. |
| 340 | 340 | ||
| 341 | config ARCH_PXA | 341 | config ARCH_PXA |
| 342 | bool "PXA2xx-based" | 342 | bool "PXA2xx/PXA3xx-based" |
| 343 | depends on MMU | 343 | depends on MMU |
| 344 | select ARCH_MTD_XIP | 344 | select ARCH_MTD_XIP |
| 345 | select GENERIC_GPIO | 345 | select GENERIC_GPIO |
| 346 | select GENERIC_TIME | 346 | select GENERIC_TIME |
| 347 | select GENERIC_CLOCKEVENTS | 347 | select GENERIC_CLOCKEVENTS |
| 348 | help | 348 | help |
| 349 | Support for Intel's PXA2XX processor line. | 349 | Support for Intel/Marvell's PXA2xx/PXA3xx processor line. |
| 350 | 350 | ||
| 351 | config ARCH_RPC | 351 | config ARCH_RPC |
| 352 | bool "RiscPC" | 352 | bool "RiscPC" |
| @@ -489,7 +489,7 @@ source arch/arm/mm/Kconfig | |||
| 489 | config IWMMXT | 489 | config IWMMXT |
| 490 | bool "Enable iWMMXt support" | 490 | bool "Enable iWMMXt support" |
| 491 | depends on CPU_XSCALE || CPU_XSC3 | 491 | depends on CPU_XSCALE || CPU_XSC3 |
| 492 | default y if PXA27x | 492 | default y if PXA27x || PXA3xx |
| 493 | help | 493 | help |
| 494 | Enable support for iWMMXt context switching at run time if | 494 | Enable support for iWMMXt context switching at run time if |
| 495 | running on a CPU that supports it. | 495 | running on a CPU that supports it. |