From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 14:44:34 +0000 (+0200)
Subject: ARM: mxs: add missing ';' after mxs_reg_32() macro calls
X-Git-Tag: KARO-TX6-2015-09-18~4034^2~1^2~19
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=bb38bfd745548f98b8f7724459f0ea8a62c73a6f

ARM: mxs: add missing ';' after mxs_reg_32() macro calls
---

diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index 55c9d38d2c..b451c66ee4 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -108,22 +108,13 @@ void enable_caches(void)
  */
 void mx28_fixup_vt(uint32_t start_addr)
 {
-	/* ldr pc, [pc, #0x18] */
 	/* Jumptable location is 0x0 */
 	uint32_t *vt = (uint32_t *)0x20;
 	uint32_t cr = get_cr();
 
-<<<<<<< HEAD
-	for (i = 0; i < 8; i++) {
-		/* cppcheck-suppress nullPointer */
-		vt[i] = ldr_pc;
-		/* cppcheck-suppress nullPointer */
-		vt[i + 8] = start_addr + (4 * i);
-	}
-=======
+	/* cppcheck-suppress nullPointer */
 	memcpy(vt, (void *)start_addr + 0x20, 32);
 	set_cr(cr & ~CR_V);
->>>>>>> karo-tx-uboot
 }
 
 #ifdef	CONFIG_ARCH_MISC_INIT