diff --git a/arch/mips/mach-xburst/include/mach/debug_ll_jz4755.h b/arch/mips/boards/rzx50/include/board/debug_ll.h
similarity index 87%
rename from arch/mips/mach-xburst/include/mach/debug_ll_jz4755.h
rename to arch/mips/boards/rzx50/include/board/debug_ll.h
index babe29653..4164e47b5 100644
--- a/arch/mips/mach-xburst/include/mach/debug_ll_jz4755.h
+++ b/arch/mips/boards/rzx50/include/board/debug_ll.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __INCLUDE_DEBUG_LL_JZ4755_H__
-#define __INCLUDE_DEBUG_LL_JZ4755_H__
+#ifndef __INCLUDE_RZX50_BOARD_DEBUG_LL_H__
+#define __INCLUDE_RZX50_BOARD_DEBUG_LL_H__
 
 #include <mach/jz4750d_regs.h>
 
 #define DEBUG_LL_UART_ADDR	UART1_BASE
 #define DEBUG_LL_UART_SHIFT	2
 
-#endif  /* __INCLUDE_DEBUG_LL_JZ4755_H__ */
+#endif  /* __INCLUDE_RZX50_BOARD_DEBUG_LL_H__ */
diff --git a/arch/mips/mach-xburst/include/mach/debug_ll.h b/arch/mips/mach-xburst/include/mach/debug_ll.h
index c3dbaa2b6..6e0cc931f 100644
--- a/arch/mips/mach-xburst/include/mach/debug_ll.h
+++ b/arch/mips/mach-xburst/include/mach/debug_ll.h
@@ -24,10 +24,7 @@
 /** @file
  *  This File contains declaration for early output support
  */
-#ifdef CONFIG_BOARD_RZX50
-#include <mach/debug_ll_jz4755.h>
-#endif
-
+#include <board/debug_ll.h>
 #include <debug_ll_ns16550.h>
 
 #endif  /* __MACH_XBURST_DEBUG_LL__ */