Merge branch 'master' into next

Conflicts:
	host/lib/usrp/usrp2/usrp2_regs.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/host/utils/usrp1_init_eeprom.cpp b/host/utils/usrp1_init_eeprom.cpp
index b05e400b1..39f091af4 100644
--- a/host/utils/usrp1_init_eeprom.cpp
+++ b/host/utils/usrp1_init_eeprom.cpp
@@ -21,6 +21,7 @@
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
 #include <iostream>
+#include <cstdlib>
 
 namespace po = boost::program_options;
 
@@ -41,6 +42,11 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         return ~0;
     }
 
+    //cant find a uninitialized usrp with this mystery module in the way...
+    if (std::system("/sbin/rmmod usbtest") != 0){
+        std::cerr << "Did not rmmod usbtest, this may be ok..." << std::endl;
+    }
+
     //load the options into the address
     uhd::device_addr_t device_addr;
     device_addr["type"] = "usrp1";