Merge branch 'mb_iface' into next

Conflicts:
	host/lib/usrp/usrp2/usrp2_iface.hpp

1 files changed, 8 insertions, 0 deletions

diff --git a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
index 8ac00c2fe..6d3f41fab 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
@@ -257,6 +257,14 @@ public:
         //unload the data
         return data.data;
     }
+    
+    void write_uart(boost::uint8_t dev, const std::string &buf) {
+        throw uhd::not_implemented_error("Unhandled command write_uart()");
+    }
+    
+    std::string read_uart(boost::uint8_t dev) {
+        throw uhd::not_implemented_error("Unhandled command read_uart()");
+    }
 
 private:
     int _node_fd;