diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-20 14:39:05 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-20 14:39:05 -0700 |
| commit | 6e918dab8c3dbdc9774389812953cc495496a8e8 (patch) | |
| tree | 90bdc62614be19470190ce645b4b9d59541a8b4c /host | |
| parent | 3e3e236acb3803d336d82ea36e6a88e50bf30f5c (diff) | |
| parent | 6eacba0a0e30090963f832ecfeacecfb829757a1 (diff) | |
| download | uhd-6e918dab8c3dbdc9774389812953cc495496a8e8.tar.gz uhd-6e918dab8c3dbdc9774389812953cc495496a8e8.tar.bz2 uhd-6e918dab8c3dbdc9774389812953cc495496a8e8.zip | |
Merge branch 'maint'
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host')
| -rw-r--r-- | host/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/usrp/common/max287x.hpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index be196198b..8dddb6552 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -284,8 +284,8 @@ UHD_INSTALL(FILES #{{{IMG_SECTION # This section is written automatically by /images/create_imgs_package.py # Any manual changes in here will be overwritten. -SET(UHD_IMAGES_MD5SUM "cb640d3271fd82e64e416f64a1d7a551") -SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.008.003-130-g4ca383f7.zip") +SET(UHD_IMAGES_MD5SUM "37d4899e320809951149c3670fb054ee") +SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.git-139-g3e3e236a.zip") #}}} ######################################################################## diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp index aa80600f7..d084dcfbe 100644 --- a/host/lib/usrp/common/max287x.hpp +++ b/host/lib/usrp/common/max287x.hpp @@ -25,6 +25,7 @@ #include <boost/assign.hpp> #include <boost/function.hpp> #include <boost/thread.hpp> +#include <boost/math/special_functions/round.hpp> #include <vector> #include "max2870_regs.hpp" #include "max2871_regs.hpp" |