From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 27 Jul 2018 11:25:20 +0000 (+0100)
Subject: resolve name clash
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad6ed4944387f23342419b978dec5b9fbd32839d;p=shakti-core.git

resolve name clash
---

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"