diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-16 16:04:26 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-16 16:04:26 -0800 |
| commit | eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178 (patch) | |
| tree | 84afd7a5c5d3c58d90999bad7478ea9e0b02a646 /host/lib/usrp/b100/b100_impl.cpp | |
| parent | 3d01dec1aba85bb9fe936cbb1ca653a82961e181 (diff) | |
| parent | 011f63d19d6c614666ba7ee145b0685d36a8a0de (diff) | |
| download | uhd-eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178.tar.gz uhd-eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178.tar.bz2 uhd-eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178.zip | |
Merge branch 'maint34' into maint
Conflicts:
host/lib/usrp/b100/b100_impl.cpp
host/lib/usrp/usrp1/usrp1_impl.hpp
Diffstat (limited to 'host/lib/usrp/b100/b100_impl.cpp')
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp index a5a0ef9b0..c4d050242 100644 --- a/host/lib/usrp/b100/b100_impl.cpp +++ b/host/lib/usrp/b100/b100_impl.cpp @@ -18,9 +18,6 @@ #include "apply_corrections.hpp" #include "b100_impl.hpp" #include "b100_regs.hpp" -#include "fpga_regs_standard.h" -#include "usrp_i2c_addr.h" -#include "usrp_commands.h" #include <uhd/transport/usb_control.hpp> #include <uhd/utils/msg.hpp> #include <uhd/exception.hpp> |