diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
| commit | a1d8b94647b6149ca38282eefac6a5f1e89fad5b (patch) | |
| tree | 7d1fcc50bee55159aa0206f148ee45188da963ec /fpga/usrp2/top | |
| parent | 40884c9411bf7d4bc91d24c939c22a3a04193d82 (diff) | |
| parent | 51c81a39cc15ac221376e5acc4eceb572e0467f9 (diff) | |
| download | uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.gz uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.bz2 uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.zip | |
Merge branch 'master' into next
Conflicts:
host/examples/CMakeLists.txt
Diffstat (limited to 'fpga/usrp2/top')
| -rw-r--r-- | fpga/usrp2/top/B100/u1plus_core.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpga/usrp2/top/B100/u1plus_core.v b/fpga/usrp2/top/B100/u1plus_core.v index 26714b669..09b7e11f1 100644 --- a/fpga/usrp2/top/B100/u1plus_core.v +++ b/fpga/usrp2/top/B100/u1plus_core.v @@ -413,7 +413,7 @@ module u1plus_core // Readback mux 32 -- Slave #7 //compatibility number -> increment when the fpga has been sufficiently altered - localparam compat_num = {16'd9, 16'd1}; //major, minor + localparam compat_num = {16'd9, 16'd2}; //major, minor wire [31:0] reg_test32; |