diff options
| author | Josh Blum <josh@joshknows.com> | 2011-05-17 15:12:38 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-05-17 15:12:38 -0700 |
| commit | 0aff497dacc9cc4eba5d800cc46343da083cfdf1 (patch) | |
| tree | 86ba88e9b103e82140a0413b1ed62ef8d38d0d7b /host/lib/usrp/usrp1/usrp1_impl.hpp | |
| parent | 9065043544dd129e16d7bb30ae8cb8d5562c3326 (diff) | |
| parent | 17ecc9a442c999f4e752a3c0dc6d237392a499e3 (diff) | |
| download | uhd-0aff497dacc9cc4eba5d800cc46343da083cfdf1.tar.gz uhd-0aff497dacc9cc4eba5d800cc46343da083cfdf1.tar.bz2 uhd-0aff497dacc9cc4eba5d800cc46343da083cfdf1.zip | |
Merge branch 'master' into release_workrelease_003_001_000
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.hpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp index 69ad9b0a0..a4d40a54d 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.hpp +++ b/host/lib/usrp/usrp1/usrp1_impl.hpp @@ -136,7 +136,6 @@ private: uhd::otw_type_t _tx_otw_type; //configuration shadows - uhd::clock_config_t _clock_config; uhd::usrp::subdev_spec_t _rx_subdev_spec, _tx_subdev_spec; //clock control |