projects
/
shakti-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fdc79ae
)
resolve name clash
author
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Fri, 27 Jul 2018 11:25:20 +0000
(12:25 +0100)
committer
Luke Kenneth Casson Leighton
<lkcl@lkcl.net>
Fri, 27 Jul 2018 11:25:20 +0000
(12:25 +0100)
src/lib/MemoryMap.bsv
patch
|
blob
|
history
diff --git
a/src/lib/MemoryMap.bsv
b/src/lib/MemoryMap.bsv
index a4fbfda4e724bfea62982bf161134da5e515b8a4..9d07c0987e52d38922436fd8442f22ad3cb5f287 100644
(file)
--- 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 soc
gen
::*;
import slow_peripherals::*;
`include "instance_defines.bsv"
`include "core_parameters.bsv"