diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-06 16:35:50 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-06 16:35:50 -0700 |
| commit | 38b740cde2dfde06185edb83d9caa64a56789914 (patch) | |
| tree | f5073ba267ee22a36e915bdb40fba94845e15958 /host/lib/usrp/usrp2/usrp2_iface.hpp | |
| parent | 949eebc0e456db83bb44da24197a038ea695b65b (diff) | |
| parent | 93d909e7c8c4053a05cdc9cb69c886183b4a7f09 (diff) | |
| download | uhd-38b740cde2dfde06185edb83d9caa64a56789914.tar.gz uhd-38b740cde2dfde06185edb83d9caa64a56789914.tar.bz2 uhd-38b740cde2dfde06185edb83d9caa64a56789914.zip | |
Merge branch 'maint'
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; |