From ad6ed4944387f23342419b978dec5b9fbd32839d Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 27 Jul 2018 12:25:20 +0100
Subject: [PATCH] resolve name clash

---
 src/lib/MemoryMap.bsv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/MemoryMap.bsv b/src/lib/MemoryMap.bsv
index a4fbfda..9d07c09 100644
--- a/src/lib/MemoryMap.bsv
+++ b/src/lib/MemoryMap.bsv
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package MemoryMap;
 	/*=== Project imports ==== */
 	import defined_types::*;
-	import soc::*;
+	import socgen::*;
 	import slow_peripherals::*;
 	`include "instance_defines.bsv"
 	`include "core_parameters.bsv"
-- 
2.30.2