From 6490e5a66fafd0f95b5b06b7a5f8faf33707a084 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Wed, 8 Jul 2009 08:32:27 -0700
Subject: [PATCH] --- yaml --- r: 163190 b: refs/heads/master c:
 baf09a4cd029c10fd46ef3d1505e2fe8cddcb48e h: refs/heads/master v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/arm/mach-davinci/board-da830-evm.c          | 2 +-
 trunk/arch/arm/mach-davinci/include/mach/debug-macro.S | 2 +-
 trunk/arch/arm/mach-davinci/include/mach/uncompress.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 04d60ce78ebf..7bd78649b349 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9eb7115bcc423ae022ebf1844820d58a77c2d435
+refs/heads/master: baf09a4cd029c10fd46ef3d1505e2fe8cddcb48e
diff --git a/trunk/arch/arm/mach-davinci/board-da830-evm.c b/trunk/arch/arm/mach-davinci/board-da830-evm.c
index 0409eb67cfe1..9185a706d14c 100644
--- a/trunk/arch/arm/mach-davinci/board-da830-evm.c
+++ b/trunk/arch/arm/mach-davinci/board-da830-evm.c
@@ -116,7 +116,7 @@ static void __init da830_evm_map_io(void)
 	da830_init();
 }
 
-MACHINE_START(DAVINCI_DA8XX_EVM, "DaVinci DA830/OMAP L137 EVM")
+MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP L137 EVM")
 	.phys_io	= IO_PHYS,
 	.io_pg_offst	= (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
 	.boot_params	= (DA8XX_DDR_BASE + 0x100),
diff --git a/trunk/arch/arm/mach-davinci/include/mach/debug-macro.S b/trunk/arch/arm/mach-davinci/include/mach/debug-macro.S
index 69837a67d5f5..9d16277b233f 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/debug-macro.S
+++ b/trunk/arch/arm/mach-davinci/include/mach/debug-macro.S
@@ -26,7 +26,7 @@
 		movne	\rx, #0xfe000000	@ virtual base
 #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx)
 #error Cannot enable DaVinci and DA8XX platforms concurrently
-#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM)
+#elif defined(CONFIG_MACH_DAVINCI_DA830_EVM)
 		orr	\rx, \rx, #0x00d00000	@ physical base address
 		orr	\rx, \rx, #0x0000d000	@ of UART 2
 #else
diff --git a/trunk/arch/arm/mach-davinci/include/mach/uncompress.h b/trunk/arch/arm/mach-davinci/include/mach/uncompress.h
index 0f1f12b67875..46a0c3171e35 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/uncompress.h
+++ b/trunk/arch/arm/mach-davinci/include/mach/uncompress.h
@@ -21,7 +21,7 @@ static u32 *uart;
 
 static u32 *get_uart_base(void)
 {
-	if (__machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM)
+	if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM)
 		return (u32 *)DA8XX_UART2_BASE;
 	else
 		return (u32 *)DAVINCI_UART0_BASE;