diff options
author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-19 12:23:44 -0800 |
---|---|---|
committer | Nicholas Corgan <nick.corgan@ettus.com> | 2012-11-19 12:23:44 -0800 |
commit | 1bf31032162c5fcf83364bb2b94255ed2c739d73 (patch) | |
tree | 02d890d5d22f61121748f1fab14e7f805d3f98d8 /host/lib/usrp/common/fx2_ctrl.cpp | |
parent | b65a3924808b48e170042f1f8ca416bd985a852f (diff) | |
parent | eaadc6e89a6bc99e5c1006c7d2aabc1dd7934178 (diff) | |
download | uhd-1bf31032162c5fcf83364bb2b94255ed2c739d73.tar.gz uhd-1bf31032162c5fcf83364bb2b94255ed2c739d73.tar.bz2 uhd-1bf31032162c5fcf83364bb2b94255ed2c739d73.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/common/fx2_ctrl.cpp')
-rw-r--r-- | host/lib/usrp/common/fx2_ctrl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/usrp/common/fx2_ctrl.cpp b/host/lib/usrp/common/fx2_ctrl.cpp index 5cc701eb0..93303542e 100644 --- a/host/lib/usrp/common/fx2_ctrl.cpp +++ b/host/lib/usrp/common/fx2_ctrl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2012 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 @@ -16,7 +16,6 @@ // #include "fx2_ctrl.hpp" -#include "usrp_commands.h" #include <uhd/utils/msg.hpp> #include <uhd/exception.hpp> #include <uhd/transport/usb_control.hpp> |