Merge branch 'master' into next

* master:
  u2p: N200 Makefile
  u1e: use icarus verilog for lint
  clean up a bunch of warnings and incorrect bus widths

1 files changed, 1 insertions, 1 deletions

diff --git a/usrp2/vrt/trigger_context_pkt.v b/usrp2/vrt/trigger_context_pkt.v
index 226ec45f2..1d456814b 100644
--- a/usrp2/vrt/trigger_context_pkt.v
+++ b/usrp2/vrt/trigger_context_pkt.v
@@ -10,7 +10,7 @@ module trigger_context_pkt
    wire [15:0] packets;
    wire [6:0]  dummy1;
    wire [14:0] dummy2;
-   wire        enable_timed, enable_consumed;
+   wire        enable_cycle, enable_consumed;
    reg [30:0]  cycle_count, packet_count;