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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 2f2b08457c67..244759bbd7b7 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -342,11 +342,11 @@ config HW_RANDOM_TPM
           If unsure, say Y.
 
 config HW_RANDOM_MSM
-        tristate "Qualcomm MSM Random Number Generator support"
-        depends on HW_RANDOM && ARCH_MSM
+        tristate "Qualcomm SoCs Random Number Generator support"
+        depends on HW_RANDOM && ARCH_QCOM
         ---help---
           This driver provides kernel-side support for the Random Number
-          Generator hardware found on Qualcomm MSM SoCs.
+          Generator hardware found on Qualcomm SoCs.
 
           To compile this driver as a module, choose M here. the
           module will be called msm-rng.