diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
| commit | 625724d7f81c214e9955334860a364802be3fda9 (patch) | |
| tree | 39d6d0087646ef4028bc6a57d33c89a28112fed8 /host/lib/usrp/usrp2/usrp2_iface.hpp | |
| parent | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (diff) | |
| parent | 3f0b770ab14aa0acaf4846680e3ee7379a1f93d7 (diff) | |
| download | uhd-625724d7f81c214e9955334860a364802be3fda9.tar.gz uhd-625724d7f81c214e9955334860a364802be3fda9.tar.bz2 uhd-625724d7f81c214e9955334860a364802be3fda9.zip | |
Merge branch 'master' into vivado
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp index a01f2ccfa..833016b7c 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.hpp +++ b/host/lib/usrp/usrp2/usrp2_iface.hpp @@ -33,7 +33,7 @@ * Provides a set of functions to implementation layer. * Including spi, peek, poke, control... */ -class usrp2_iface : public uhd::wb_iface, public uhd::spi_iface, public uhd::i2c_iface +class usrp2_iface : public uhd::timed_wb_iface, public uhd::spi_iface, public uhd::i2c_iface { public: typedef boost::shared_ptr<usrp2_iface> sptr; |