From ffb54e6372daca45cd91612b003798cee957b781 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 16:44:32 +0200
Subject: [PATCH] arm: mxs: remove conflict markers from merge

---
 board/karo/tx28/tx28.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
 {
-- 
2.39.2