From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 14:44:32 +0000 (+0200)
Subject: arm: mxs: remove conflict markers from merge
X-Git-Tag: KARO-TX6-2015-09-18~4034^2~1^2~20
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=ffb54e6372daca45cd91612b003798cee957b781

arm: mxs: remove conflict markers from merge
---

diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c
index c578c0650e..b6ea8fbf78 100644
--- a/board/karo/tx28/tx28.c
+++ b/board/karo/tx28/tx28.c
@@ -100,7 +100,7 @@ static const iomux_cfg_t tx28_pads[] = {
 /* provide at least _some_ sort of randomness */
 #define MAX_LOOPS       100
 
-static u32 random;
+static u32 random __attribute__((section("data")));
 
 static inline void random_init(void)
 {