diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-16 18:36:29 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-16 18:36:29 -0700 |
| commit | 1b31a8780d44e5e466afe4b23fd98c74e534c7a3 (patch) | |
| tree | edce524c830b495d67e82ddf4f3de129d3a7876e /usrp2/top | |
| parent | f139c98ae7bf1f9f38b42417540a1294fe26ef68 (diff) | |
| parent | 38ec062b628e39397999d86fb3a68438aa586d5a (diff) | |
| download | uhd-1b31a8780d44e5e466afe4b23fd98c74e534c7a3.tar.gz uhd-1b31a8780d44e5e466afe4b23fd98c74e534c7a3.tar.bz2 uhd-1b31a8780d44e5e466afe4b23fd98c74e534c7a3.zip | |
Merge branch 'maint'
Conflicts:
usrp2/top/E1x0/u1e_core.v
Diffstat (limited to 'usrp2/top')
| -rw-r--r-- | usrp2/top/E1x0/u1e_core.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usrp2/top/E1x0/u1e_core.v b/usrp2/top/E1x0/u1e_core.v index 77be1bfb0..fef988e62 100644 --- a/usrp2/top/E1x0/u1e_core.v +++ b/usrp2/top/E1x0/u1e_core.v @@ -454,7 +454,7 @@ module u1e_core // Readback mux 32 -- Slave #7 //compatibility number -> increment when the fpga has been sufficiently altered - localparam compat_num = {16'd10, 16'd1}; //major, minor + localparam compat_num = {16'd10, 16'd2}; //major, minor wire [31:0] reg_test32; |