diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-09 09:47:55 -0700 |
| commit | 625724d7f81c214e9955334860a364802be3fda9 (patch) | |
| tree | 39d6d0087646ef4028bc6a57d33c89a28112fed8 /host/lib/usrp/e100/e100_impl.hpp | |
| parent | 700bf99bdc483fdcc9deb54abc29bd7f81e16089 (diff) | |
| parent | 3f0b770ab14aa0acaf4846680e3ee7379a1f93d7 (diff) | |
| download | uhd-625724d7f81c214e9955334860a364802be3fda9.tar.gz uhd-625724d7f81c214e9955334860a364802be3fda9.tar.bz2 uhd-625724d7f81c214e9955334860a364802be3fda9.zip | |
Merge branch 'master' into vivado
Diffstat (limited to 'host/lib/usrp/e100/e100_impl.hpp')
| -rw-r--r-- | host/lib/usrp/e100/e100_impl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/e100/e100_impl.hpp b/host/lib/usrp/e100/e100_impl.hpp index 0838bd8c4..4efc21427 100644 --- a/host/lib/usrp/e100/e100_impl.hpp +++ b/host/lib/usrp/e100/e100_impl.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2012,2014 Ettus Research LLC +// Copyright 2010-2012,2014-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -61,7 +61,7 @@ extern void e100_load_fpga(const std::string &bin_file); //! Make an e100 dboard interface uhd::usrp::dboard_iface::sptr make_e100_dboard_iface( - uhd::wb_iface::sptr wb_iface, + uhd::timed_wb_iface::sptr wb_iface, uhd::i2c_iface::sptr i2c_iface, uhd::spi_iface::sptr spi_iface, e100_clock_ctrl::sptr clock, |