ARM: mxs: add missing ';' after mxs_reg_32() macro calls
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:34 +0000 (16:44 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:34 +0000 (16:44 +0200)
arch/arm/cpu/arm926ejs/mxs/mxs.c

index 55c9d38..b451c66 100644 (file)
@@ -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