diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-03-05 10:44:18 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-03-05 10:44:18 -0800 |
commit | ce9d4346603597f2dbd508879495f0aceddcda92 (patch) | |
tree | 0c88f3b12e4dc4494c7abdf314ceb8f939741ffd /host/lib/usrp/usrp2/usrp2_impl.hpp | |
parent | e994fad15798e7f2f7a7c34f20bbdee0e6d5ed1a (diff) | |
parent | e067c45bdeb5ce7fcef8b96d23244f1c6f51c763 (diff) | |
download | uhd-ce9d4346603597f2dbd508879495f0aceddcda92.tar.gz uhd-ce9d4346603597f2dbd508879495f0aceddcda92.tar.bz2 uhd-ce9d4346603597f2dbd508879495f0aceddcda92.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index edbb7888b..fac4b3907 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -116,6 +116,7 @@ private: bool _ignore_cal_file; //io impl methods and members + uhd::device_addr_t device_addr; UHD_PIMPL_DECL(io_impl) _io_impl; void io_init(void); void update_tick_rate(const double rate); |