summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-01-09 12:07:32 +0400
committerOlof Johansson <olof@lixom.net>2014-01-09 12:07:32 +0400
commit64576e439709738c0f55ab60cdba0ad18d5aa24e (patch)
tree031394615b00dacbcec5c9e4b99f4494992ce375 /drivers/tty
parent3d7e0207ced354d1647195f53bcc670f9756c649 (diff)
parentc0f8a48723d1e7ec48f65c72f880bc49edea9a4a (diff)
downloadlinux-64576e439709738c0f55ab60cdba0ad18d5aa24e.tar.xz
Merge branch 'qcom/drivers' into next/drivers
* qcom/drivers: tty: serial: Limit msm_serial_hs driver to platforms that use it mmc: msm_sdcc: Limit driver to platforms that use it usb: phy: msm: Move mach dependent code to platform data Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index a3817ab8602f..a53159cd62f9 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1035,7 +1035,7 @@ config SERIAL_MSM_CONSOLE
config SERIAL_MSM_HS
tristate "MSM UART High Speed: Serial Driver"
- depends on ARCH_MSM
+ depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
select SERIAL_CORE
help
If you have a machine based on MSM family of SoCs, you