diff options
author | Martin Braun <martin.braun@ettus.com> | 2017-01-17 10:00:47 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2017-01-17 10:00:47 -0800 |
commit | 52ca2e0b8045c254c2be1911e77e8bd3d94ceeab (patch) | |
tree | c7e1a93eeadd65bb13db1aa68974da495114f046 /host/lib/usrp/cores | |
parent | 46febf986ae5e89ebb0c350fd9aa42aaa6383997 (diff) | |
parent | 95ff7e859d57829e428d41d7746e28c228b983ba (diff) | |
download | uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.gz uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.tar.bz2 uhd-52ca2e0b8045c254c2be1911e77e8bd3d94ceeab.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/cores')
-rw-r--r-- | host/lib/usrp/cores/rx_frontend_core_3000.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/host/lib/usrp/cores/rx_frontend_core_3000.cpp b/host/lib/usrp/cores/rx_frontend_core_3000.cpp index 1c4674a8a..e7d25eb8c 100644 --- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp +++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp @@ -170,7 +170,6 @@ public: default: return _adc_rate; } - return _adc_rate; } private: |