diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 18:09:27 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 18:09:27 +0100 |
| commit | f1a0d58e876be28bd2f53b55dd20d3cba92c6937 (patch) | |
| tree | 3be5116e2de217634ca3f99fe2459ac8a39025be /arch/arm/Makefile | |
| parent | a3f4fdf2190edef9d0d7a9bd6246e7f599284590 (diff) | |
| parent | cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166 (diff) | |
Merge branch 'qcom/cleanup' into next/drivers
* qcom/cleanup:
ARM: qcom: Rename various msm prefixed functions to qcom
clocksource: qcom: split building of legacy vs multiplatform support
ARM: qcom: Split Qualcomm support into legacy and multiplatform
clocksource: qcom: Move clocksource code out of mach-msm
ARM: msm: kill off hotplug.c
ARM: msm: Remove pen_release usage
ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
This cleanup branch is a dependency for the following qcom driver changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 08a9ef58d9c3..51e5bede657f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -180,6 +180,7 @@ machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 machine-$(CONFIG_ARCH_ORION5X) += orion5x machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PXA) += pxa +machine-$(CONFIG_ARCH_QCOM) += qcom machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc |