diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-10 14:08:51 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-10 14:08:51 -0800 |
| commit | 552caa6980c3fce4baee9d6b899e07482e8ce556 (patch) | |
| tree | 39bdcb967df43e4ae5b20deca44fd730e9cbafd2 /host/lib | |
| parent | 11e9d7e8fcb649d978a4a5cad8e2b0aa77e4a508 (diff) | |
| parent | 7d140b0237b3fa4e07b364e912887f68c02839cb (diff) | |
| download | uhd-552caa6980c3fce4baee9d6b899e07482e8ce556.tar.gz uhd-552caa6980c3fce4baee9d6b899e07482e8ce556.tar.bz2 uhd-552caa6980c3fce4baee9d6b899e07482e8ce556.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/dboard/db_tvrx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp index dc38ef45e..d264c9ca4 100644 --- a/host/lib/usrp/dboard/db_tvrx.cpp +++ b/host/lib/usrp/dboard/db_tvrx.cpp @@ -453,7 +453,7 @@ void tvrx::rx_get(const wax::obj &key_, wax::obj &val){ return; case SUBDEV_PROP_CONNECTION: - val = SUBDEV_CONN_COMPLEX_IQ; + val = SUBDEV_CONN_REAL_I; return; case SUBDEV_PROP_ENABLED: |