--- zzzz-none-000/linux-2.6.28.10/arch/arm/kernel/debug.S	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/arm/kernel/debug.S	2009-06-04 07:28:46.000000000 +0000
@@ -22,7 +22,10 @@
 #if defined(CONFIG_DEBUG_ICEDCC)
 		@@ debug using ARM EmbeddedICE DCC channel
 
-#if defined(CONFIG_CPU_V6)
+#if defined(CONFIG_ARM_PUMA5)
+#include <mach/debug-macro.S>
+
+#elif defined(CONFIG_CPU_V6)
 
 		.macro	addruart, rx
 		.endm
@@ -49,6 +52,7 @@
 1002:
 		.endm
 
+
 #else
 
 		.macro	addruart, rx
@@ -77,12 +81,14 @@
 1002:
 		.endm
 
-#endif	/* CONFIG_CPU_V6 */
 
+#endif	/* CONFIG_CPU_V6 */
 #else
 #include <mach/debug-macro.S>
 #endif	/* CONFIG_DEBUG_ICEDCC */
 
+
+
 /*
  * Useful debugging routines
  */