aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1
diff options
context:
space:
mode:
authorAshish Chaudhari <ashish@ettus.com>2015-10-15 16:24:18 -0700
committerAshish Chaudhari <ashish@ettus.com>2015-10-15 16:24:18 -0700
commitb48fe5bb659f66bb3f221ea031ddf9a2c80d82bf (patch)
tree1bb69b5fe5ba0461344e4f9eb6423809d11e9eec /host/lib/usrp/usrp1
parentc41a7fa386a467ba76d5f09f390cb62a1bfa7282 (diff)
parent6f93ac01b519b5e01b01d7b8bcc106e58fd50721 (diff)
downloaduhd-b48fe5bb659f66bb3f221ea031ddf9a2c80d82bf.tar.gz
uhd-b48fe5bb659f66bb3f221ea031ddf9a2c80d82bf.tar.bz2
uhd-b48fe5bb659f66bb3f221ea031ddf9a2c80d82bf.zip
Merge branch 'ashish/gpio_atr_redux' into master-staging
Conflicts: host/lib/usrp/cores/CMakeLists.txt host/lib/usrp/x300/x300_impl.hpp
Diffstat (limited to 'host/lib/usrp/usrp1')
-rw-r--r--host/lib/usrp/usrp1/dboard_iface.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp1/dboard_iface.cpp b/host/lib/usrp/usrp1/dboard_iface.cpp
index 4c3141d9e..502d0fbe3 100644
--- a/host/lib/usrp/usrp1/dboard_iface.cpp
+++ b/host/lib/usrp/usrp1/dboard_iface.cpp
@@ -63,6 +63,7 @@
using namespace uhd;
using namespace uhd::usrp;
+using namespace uhd::usrp::gpio_atr;
using namespace boost::assign;
static const dboard_id_t tvrx_id(0x0040);