diff options
| author | Josh Blum <josh@joshknows.com> | 2012-05-10 20:33:43 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-05-10 20:33:43 -0700 |
| commit | 9786c2bd7ba90f8a5abe29b19ba69a30f153f1b4 (patch) | |
| tree | 94d29428c212881d7d0d1200d9fc9d0f908b7362 /usrp2/top | |
| parent | cb313ea980ea1078735b6e009bc3e69d1ae0dbf6 (diff) | |
| parent | db1d63ecaa76f4975b79499119419b5baff10a99 (diff) | |
| download | uhd-9786c2bd7ba90f8a5abe29b19ba69a30f153f1b4.tar.gz uhd-9786c2bd7ba90f8a5abe29b19ba69a30f153f1b4.tar.bz2 uhd-9786c2bd7ba90f8a5abe29b19ba69a30f153f1b4.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 d4af8c0df..77be1bfb0 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'd0}; //major, minor + localparam compat_num = {16'd10, 16'd1}; //major, minor wire [31:0] reg_test32; |