3 files changed, 4 insertions, 8 deletions
diff --git a/host/lib/usrp/usrp_e100/CMakeLists.txt b/host/lib/usrp/usrp_e100/CMakeLists.txt
index 97a3d5d9a..66c87e0d8 100644
--- a/host/lib/usrp/usrp_e100/CMakeLists.txt
+++ b/host/lib/usrp/usrp_e100/CMakeLists.txt
@@ -22,24 +22,20 @@
 ########################################################################
 MESSAGE(STATUS "Configuring USRP-E100 support...")
 
-INCLUDE(CheckIncludeFileCXX)
-CHECK_INCLUDE_FILE_CXX(linux/usrp_e.h HAVE_LINUX_USRP_E_H)
-
-SET(ENABLE_USRP_E TRUE)
-
 IF(DEFINED ENABLE_USRP_E100)
     IF(ENABLE_USRP_E100)
         MESSAGE(STATUS "USRP-E100 support enabled by configure flag")
     ELSE(ENABLE_USRP_E100)
         MESSAGE(STATUS "USRP-E100 support disabled by configure flag")
     ENDIF(ENABLE_USRP_E100)
-ELSE(DEFINED ENABLE_USRP_E100) #not defined: automatic enabling of component
-    SET(ENABLE_USRP_E100 ${HAVE_LINUX_USRP_E_H})
+ELSE(DEFINED ENABLE_USRP_E100) #not defined: automatic disabling of component
+    SET(ENABLE_USRP_E100 FALSE)
 ENDIF(DEFINED ENABLE_USRP_E100)
 SET(ENABLE_USRP_E100 ${ENABLE_USRP_E100} CACHE BOOL "enable USRP-E100 support")
 
 IF(ENABLE_USRP_E100)
     MESSAGE(STATUS "  Building USRP-E100 support.")
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/include)
     LIBUHD_APPEND_SOURCES(
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.cpp
         ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.hpp
diff --git a/host/include/linux/usrp_e.h b/host/lib/usrp/usrp_e100/include/linux/usrp_e.h
index 4c6a5dd89..4c6a5dd89 100644
--- a/host/include/linux/usrp_e.h
+++ b/host/lib/usrp/usrp_e100/include/linux/usrp_e.h
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp b/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp
index 73cb1f285..1ff135eac 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_impl.cpp
@@ -51,7 +51,7 @@ static device_addrs_t usrp_e100_find(const device_addr_t &hint){
     //device node not provided, assume its 0
     if (not hint.has_key("node")){
         device_addr_t new_addr = hint;
-        new_addr["node"] = "/dev/usrp_e1000";
+        new_addr["node"] = "/dev/usrp_e0";
         return usrp_e100_find(new_addr);
     }