diff options
| author | Daniel Walker <dwalker@codeaurora.org> | 2010-08-18 11:00:25 -0700 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-10-08 15:12:43 -0700 |
| commit | 46fe5f29e3062f681cc3cf07a604d82396faea89 (patch) | |
| tree | 9dd086b4935f4c4ba409afd901ed79571118dc54 /arch/arm/mach-msm/include | |
| parent | 4ca06de368ddfaee47983d3d1f9eec9e2a6c23d4 (diff) | |
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 <dwalker@codeaurora.org>
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/include')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index 528750f307e9..238c4f132cdb 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 <mach/hardware.h> #include <mach/msm_iomap.h> -#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 |