diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
| commit | 4226748ddda610eafaf5c6c32be206c336232b80 (patch) | |
| tree | 93795f42993ba85ffe4b1d4b539bc72eccd638d5 /fpga/usrp1/inband_lib | |
| parent | c2122833e25ffe6e8e6918874afe7a3c9a92bc87 (diff) | |
| parent | 24b07e1b0dbe8ab9d72c46f65c14c34e84347554 (diff) | |
| download | uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.gz uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.bz2 uhd-4226748ddda610eafaf5c6c32be206c336232b80.zip | |
Merge branch 'fpga_master' into uhd_master
Conflicts:
fpga/usrp1/toplevel/usrp_std/usrp_std.v
Diffstat (limited to 'fpga/usrp1/inband_lib')
| -rwxr-xr-x | fpga/usrp1/inband_lib/rx_buffer_inband.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpga/usrp1/inband_lib/rx_buffer_inband.v b/fpga/usrp1/inband_lib/rx_buffer_inband.v index cbd2d8958..40c7ec7bd 100755 --- a/fpga/usrp1/inband_lib/rx_buffer_inband.v +++ b/fpga/usrp1/inband_lib/rx_buffer_inband.v @@ -1,5 +1,5 @@ -//`include "../../firmware/include/fpga_regs_common.v"
-//`include "../../firmware/include/fpga_regs_standard.v"
+//`include "../common/fpga_regs_common.v"
+//`include "../common/fpga_regs_standard.v"
module rx_buffer_inband
( input usbclk,
input bus_reset,
|