Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

[pandora-kernel.git] / arch / arm / mach-msm / include / mach / debug-macro.S

diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index fbd5d90..2dc73cc 100644 (file)
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -19,8 +19,8 @@
 #include <mach/hardware.h>
 #include <mach/msm_iomap.h>
 
-#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
-       .macro  addruart, rp, rv
+#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE)
+       .macro  addruart, rp, rv, tmp
        ldr     \rp, =MSM_DEBUG_UART_PHYS
        ldr     \rv, =MSM_DEBUG_UART_BASE
        .endm
@@ -36,7 +36,18 @@
        tst     \rd, #0x04
        beq     1001b
        .endm
+#else
+       .macro  addruart, rp, rv, tmp
+       mov     \rv, #0xff000000
+       orr     \rv, \rv, #0x00f00000
+       .endm
 
-       .macro  busyuart,rd,rx
+       .macro  senduart,rd,rx
+       .endm
+
+       .macro  waituart,rd,rx
        .endm
 #endif
+
+       .macro  busyuart,rd,rx
+       .endm