diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:12:54 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:12:54 +0100 |
| commit | 94e11cb457fc7cc9b5fa5259881ec5b729eff201 (patch) | |
| tree | 8437e1890af5fc959420e2a6cc651a85c538f31c /host/lib/usrp/e300/e300_fpga_defs.hpp | |
| parent | 5047677c784077be82d11be26277260e6350a5bc (diff) | |
| parent | d238f12252870d73df125649d965edc2a05debf5 (diff) | |
| download | uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.tar.gz uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.tar.bz2 uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.zip | |
Merge branch 'maint'
Conflicts:
host/docs/usrp_e3x0.dox
Diffstat (limited to 'host/lib/usrp/e300/e300_fpga_defs.hpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_fpga_defs.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/e300/e300_fpga_defs.hpp b/host/lib/usrp/e300/e300_fpga_defs.hpp index 5fba65b90..c038efbae 100644 --- a/host/lib/usrp/e300/e300_fpga_defs.hpp +++ b/host/lib/usrp/e300/e300_fpga_defs.hpp @@ -21,7 +21,7 @@ namespace uhd { namespace usrp { namespace e300 { namespace fpga { static const size_t NUM_RADIOS = 2; -static const boost::uint32_t COMPAT_MAJOR = 5; +static const boost::uint32_t COMPAT_MAJOR = 6; static const boost::uint32_t COMPAT_MINOR = 0; }}}} // namespace |