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

2 files changed, 2 insertions, 2 deletions

diff --git a/usrp2/control_lib/atr_controller.v b/usrp2/control_lib/atr_controller.v
index fed2791f9..a161b5e00 100644
--- a/usrp2/control_lib/atr_controller.v
+++ b/usrp2/control_lib/atr_controller.v
@@ -7,7 +7,7 @@ module atr_controller
   (input clk_i, input rst_i,
    input [5:0] adr_i, input [3:0] sel_i, input [31:0] dat_i, output reg [31:0] dat_o,
    input we_i, input stb_i, input cyc_i, output reg ack_o,
-   input run_rx, input run_tx, input [31:0] master_time,
+   input run_rx, input run_tx,
    output [31:0] ctrl_lines);
    
    reg [3:0] state;
diff --git a/usrp2/control_lib/atr_controller16.v b/usrp2/control_lib/atr_controller16.v
index 3d8b5b1e9..74ce30a54 100644
--- a/usrp2/control_lib/atr_controller16.v
+++ b/usrp2/control_lib/atr_controller16.v
@@ -7,7 +7,7 @@ module atr_controller16
   (input clk_i, input rst_i,
    input [5:0] adr_i, input [1:0] sel_i, input [15:0] dat_i, output reg [15:0] dat_o,
    input we_i, input stb_i, input cyc_i, output reg ack_o,
-   input run_rx, input run_tx, input [31:0] master_time,
+   input run_rx, input run_tx,
    output [31:0] ctrl_lines);
    
    reg [3:0] state;