From 46fe5f29e3062f681cc3cf07a604d82396faea89 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Wed, 18 Aug 2010 11:00:25 -0700 Subject: msm: allow uart to be conditionally disabled Some MSM targets don't select the debug UART in this way. For those we need to disable this selection mechanism. Signed-off-by: Daniel Walker Signed-off-by: Jeff Ohlstein Signed-off-by: Daniel Walker --- arch/arm/mach-msm/include/mach/debug-macro.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-msm/include') diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index 528750f307e..238c4f132cd 100644 --- a/arch/arm/mach-msm/include/mach/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S @@ -19,7 +19,7 @@ #include #include -#ifdef CONFIG_MSM_DEBUG_UART +#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS .macro addruart, rx, tmp @ see if the MMU is enabled and select appropriate base address mrc p15, 0, \rx, c1, c0 -- cgit v1.2.3-70-g09d2