diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-09 09:09:16 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-09 09:09:16 +0100 |
| commit | e37fce7346dcc4ab1a3f6be675c901efc3af6964 (patch) | |
| tree | 9fa125259d370e52bee6f684e4932e526997eb05 /arch/arm/Kconfig | |
| parent | Merge tag 'ux500-core-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | ARM: msm: Move MSM's DT based hardware to multi-platform support (diff) | |
| download | linux-e37fce7346dcc4ab1a3f6be675c901efc3af6964.tar.xz linux-e37fce7346dcc4ab1a3f6be675c901efc3af6964.zip | |
Merge branch 'qcom/soc2' into next/soc
* qcom/soc2:
ARM: msm: Move MSM's DT based hardware to multi-platform support
ARM: msm: Only build timer.c if required
ARM: msm: Only build clock.c on proc_comm based platforms
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d08045df8213..676bcf6ef3d6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -651,10 +651,10 @@ config ARCH_PXA help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. -config ARCH_MSM +config ARCH_MSM_NODT bool "Qualcomm MSM" + select ARCH_MSM select ARCH_REQUIRE_GPIOLIB - select CLKSRC_OF if OF select COMMON_CLK select GENERIC_CLOCKEVENTS help |