Merge branch 'devel'

lnls-dig · Mar 1, 2018 · 91ebf0c · 91ebf0c
2 parents d79cf4e + 1ecc01f
commit 91ebf0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/hdl/ip_cores/infra-cores b/hdl/ip_cores/infra-cores
diff --git a/hdl/top/afc_v3/vivado/dbe_bpm_gen/dbe_bpm_gen.vhd b/hdl/top/afc_v3/vivado/dbe_bpm_gen/dbe_bpm_gen.vhd
@@ -49,6 +49,8 @@ use work.synthesis_descriptor_pkg.all;
 use work.pcie_cntr_axi_pkg.all;
 -- Trigger Modules
 use work.trigger_pkg.all;
+-- Trigger Common Modules
+use work.trigger_common_pkg.all;
 
 entity dbe_bpm_gen is
 generic(