commit b4c48e8780325e1f2ba79ccc0fb2a6c99c7cfac2
author Olof Johansson <olof@lixom.net> Fri May 30 20:34:23 2014 -0700
committer Olof Johansson <olof@lixom.net> Fri May 30 20:34:23 2014 -0700
tree 6c7d1d5f5277a8c115c3c8418e080c438c7bb646
parent 7db76c4154a3633577903b171e3ddb484498df85
parent 2f528dd3b30c4351c0ece73b8bdc39753c02003b

Merge tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/soc

Merge "Qualcomm ARM Based SoC Updates for v3.16-2" from Kumar Gala:

* Updated Kconfig DEBUG_QCOM_UARTDM help to include APQ8084 info

* tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 6ff3dc6..149d1f0 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -383,6 +383,7 @@
 		  their output to the serial port on Qualcomm devices.
 
 		  ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
+		  APQ8084   0xf995e000        0xfa75e000
 		  MSM8X60   0x19c40000        0xf0040000
 		  MSM8960   0x16440000        0xf0040000
 		  MSM8974   0xf991e000        0xfa71e000