[GIT PULL] qcom SoC changes for v3.16

[Ivan T. Ivanov]

On Mon, 2014-05-26 at 14:49 +0200, Paul Bolle wrote:
> On Fri, 2014-05-23 at 13:42 -0500, Kumar Gala wrote:
> > Ivan T. Ivanov (1):
> >        ARM: debug: qcom: make UART address selection configuration option
> 
> This one just landed in linux-next (next-20140526).
> 
> It removed the Kconfig options DEBUG_MSM_UART1, DEBUG_MSM_UART3, and
> DEBUG_MSM_UART3. It did not touch these references to their macros:
>     arch/arm/mach-msm/io.c:60:#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
>     arch/arm/mach-msm/io.c:61:                defined(CONFIG_DEBUG_MSM_UART3)
>     arch/arm/mach-msm/io.c:79:#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
>     arch/arm/mach-msm/io.c:80:                defined(CONFIG_DEBUG_MSM_UART3)
> 
> Is a patch to fix this queued somewhere?
> 

Hm, there was some conflicts, which where resolved by Stephen
Rothwell [1], but maybe there is still something wrong. Have to check.

Regards,
Ivan

[1] https://lkml.org/lkml/2014/5/25/147


> 
> Paul Bolle
>