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

2 files changed, 0 insertions, 41 deletions

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 52ed809ab..7369e7600 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -100,13 +100,6 @@ LIST(APPEND libuhd_sources
 )
 
 ########################################################################
-# Conditionally add the usrp1e sources
-########################################################################
-LIST(APPEND libuhd_sources
-    usrp/usrp1e/usrp1e_none.cpp
-)
-
-########################################################################
 # Setup defines for module loading
 ########################################################################
 MESSAGE(STATUS "Configuring module loading...")
diff --git a/host/lib/usrp/usrp1e/usrp1e_none.cpp b/host/lib/usrp/usrp1e/usrp1e_none.cpp
deleted file mode 100644
index 84fb9276c..000000000
--- a/host/lib/usrp/usrp1e/usrp1e_none.cpp
+++ /dev/null
@@ -1,34 +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/>.
-//
-
-#include <uhd/usrp/usrp1e.hpp>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-/*!
- * This file defines the usrp1e discover and make functions
- * when the required kernel module headers are not present.
- */
-
-device_addrs_t usrp1e::find(const device_addr_t &){
-    return device_addrs_t(); //return empty list
-}
-
-device::sptr usrp1e::make(const device_addr_t &){
-    throw std::runtime_error("this build has no usrp1e support");
-}