summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-02-25 18:10:24 +0100
committerArnd Bergmann <arnd@arndb.de>2014-02-25 18:10:57 +0100
commit23453853e40539e64592b5ae771020e43ed371a2 (patch)
tree3a7e7058679f3f7ff7a8133516e46bfe586c2934 /drivers/power
parentf1a0d58e876be28bd2f53b55dd20d3cba92c6937 (diff)
parentadd798a40aec3a768165055477ba8bfee21e06fc (diff)
downloadlinux-23453853e40539e64592b5ae771020e43ed371a2.tar.bz2
Merge tag 'qcom-drivers-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/drivers
Merge "qcom driver changes for v3.15" from Kumar Gala: We've split Qualcomm MSM support into legacy and multiplatform. These drivers are only relevant on the multiplatform supported SoCs so switch the Kconfig depends to ARCH_QCOM. * tag 'qcom-drivers-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: gpio: msm: switch Kconfig to ARCH_QCOM depends hwrng: msm: switch Kconfig to ARCH_QCOM depends power: reset: msm - switch Kconfig to ARCH_QCOM depends drm/msm: drop ARCH_MSM Kconfig depend tty: serial: msm: Enable building msm_serial for ARCH_QCOM
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/reset/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 6d452a78b19c..fa0e4e057b99 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -22,7 +22,7 @@ config POWER_RESET_GPIO
config POWER_RESET_MSM
bool "Qualcomm MSM power-off driver"
- depends on POWER_RESET && ARCH_MSM
+ depends on POWER_RESET && ARCH_QCOM
help
Power off and restart support for Qualcomm boards.