Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd

2 files changed, 0 insertions, 49 deletions

diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt
index 7815a4fb9..9140d98ca 100644
--- a/host/include/uhd/usrp/CMakeLists.txt
+++ b/host/include/uhd/usrp/CMakeLists.txt
@@ -31,7 +31,6 @@ INSTALL(FILES
     dboard_manager.hpp
 
     ### usrp headers ###
-    usrp1e.hpp
     usrp2.hpp
 
     ### utilities ###
diff --git a/host/include/uhd/usrp/usrp1e.hpp b/host/include/uhd/usrp/usrp1e.hpp
deleted file mode 100644
index cee9dc3d5..000000000
--- a/host/include/uhd/usrp/usrp1e.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Copyright 2010 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_USRP_USRP1E_HPP
-#define INCLUDED_UHD_USRP_USRP1E_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/device.hpp>
-
-namespace uhd{ namespace usrp{
-
-/*!
- * The usrp1e device class.
- */
-class UHD_API usrp1e : public device{
-public:
-    /*!
-     * Find usrp1e devices on the system via the device node.
-     * \param hint a device addr with the usrp1e address filled in
-     * \return a vector of device addresses for all usrp1es found
-     */
-    static device_addrs_t find(const device_addr_t &hint);
-
-    /*!
-     * Make a usrp1e from a device address.
-     * \param addr the device address
-     * \return a device sptr to a new usrp1e
-     */
-    static device::sptr make(const device_addr_t &addr);
-};
-
-}} //namespace
-
-#endif /* INCLUDED_UHD_USRP_USRP1E_HPP */