diff options
| author | Daniel Walker <dwalker@codeaurora.org> | 2010-01-02 00:11:43 +0100 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-05-03 20:15:00 +0200 |
| commit | 4b53eb4f5d78416456bb969ce30e3bed2731d744 (patch) | |
| tree | bcc68c06542b8241d37fe43dfaa68e3aadbd9bb3 /arch | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff) | |
| download | linux-4b53eb4f5d78416456bb969ce30e3bed2731d744.tar.xz linux-4b53eb4f5d78416456bb969ce30e3bed2731d744.zip | |
arm: msm: allow ARCH_MSM to have v7 cpus
ARCH_MSM supports armv7 cpus, so we're pushed the CPU_V6/CPU_V7 selection
down into the arch/arm/mach-msm/Kconfig.
Also update the description to be a bit more accurate.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 10 | ||||
| -rw-r--r-- | arch/arm/mach-msm/Kconfig | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 92622eb5cc0d..9264d0176c3b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -601,14 +601,14 @@ config ARCH_PXA config ARCH_MSM bool "Qualcomm MSM" - select CPU_V6 select GENERIC_TIME select GENERIC_CLOCKEVENTS help - Support for Qualcomm MSM7K based systems. This runs on the ARM11 - apps processor of the MSM7K and depends on a shared memory - interface to the ARM9 modem processor which runs the baseband stack - and controls some vital subsystems (clock and power control, etc). + Support for Qualcomm MSM/QSD based systems. This runs on the + apps processor of the MSM/QSD and depends on a shared memory + interface to the modem processor which runs the baseband + stack and controls some vital subsystems + (clock and power control, etc). config ARCH_SHMOBILE bool "Renesas SH-Mobile" diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index f780086befd7..b9fd5c528e5b 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -29,12 +29,14 @@ endchoice config MACH_HALIBUT depends on ARCH_MSM + select CPU_V6 default y bool "Halibut Board (QCT SURF7201A)" help Support for the Qualcomm SURF7201A eval board. config MACH_TROUT + select CPU_V6 default y bool "HTC Dream (aka trout)" help |