diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 12:10:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 12:10:37 -0800 |
| commit | 47ec7e0b7567f10da2975e05fa446be204dc2fcb (patch) | |
| tree | 68afe60332674b4e737a07e03ebdc5b614454162 /drivers/tty | |
| parent | 8483ff079d99e87c5da20767c0b894221019386f (diff) | |
| parent | bbeaa59598cae12626c9c42e91821e3abd5b87f0 (diff) | |
| download | linux-47ec7e0b7567f10da2975e05fa446be204dc2fcb.tar.gz linux-47ec7e0b7567f10da2975e05fa446be204dc2fcb.tar.bz2 linux-47ec7e0b7567f10da2975e05fa446be204dc2fcb.zip | |
Merge tag 'qcom-soc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Qualcomm ARM Based SoC Updates for 4.5
* Add WCNSS_CTRL client
* Various Kconfig changes to fix build issues
* Update SoC Qualcomm MAINTAINERS entry
* Add SMP2P, SMSM, and SMEM state machine drivers
* Add SMD-RPM support for existing platforms
* tag 'qcom-soc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
MAINTAINERS: Change QCOM entries
soc: qcom: smd-rpm: Add existing platform support
soc: qcom: Introduce WCNSS_CTRL SMD client
ARM: qcom: select ARM_CPU_SUSPEND for power management
MAINTAINERS: Add rules for Qualcomm dts files
soc: qcom: enable smsm/smp2p modular build
serial: msm_serial: Make config tristate
soc: qcom: smp2p: Qualcomm Shared Memory Point to Point
soc: qcom: smsm: Add driver for Qualcomm SMSM
soc: qcom: Introduce common SMEM state machine code
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index f38beb28e7ae..ee9c513ef5e4 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1044,7 +1044,7 @@ config SERIAL_SGI_IOC3 say Y or M. Otherwise, say N. config SERIAL_MSM - bool "MSM on-chip serial port support" + tristate "MSM on-chip serial port support" depends on ARCH_QCOM select SERIAL_CORE |