summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-11 10:41:20 -0800
committerJosh Blum <josh@joshknows.com>2010-11-11 10:41:20 -0800
commit0d0b4724b03070b8a4c988c5911655fd522930dd (patch)
tree9f3be747a5d5a735180e897d029037ac08d862f2
parent791401f979aae3e5909ed0a7a06e176f0c16cd5a (diff)
parentf2d5f0b12bd0e9a29d22a93a6aaa4565021583e4 (diff)
downloaduhd-0d0b4724b03070b8a4c988c5911655fd522930dd.tar.gz
uhd-0d0b4724b03070b8a4c988c5911655fd522930dd.tar.bz2
uhd-0d0b4724b03070b8a4c988c5911655fd522930dd.zip
Merge branch 'usrp_e100_i2c' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e100_i2c
-rw-r--r--host/lib/usrp/usrp_e100/usrp_e100_iface.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
index 40c7afabb..50ff4a8ff 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp
@@ -23,7 +23,6 @@
#include <boost/format.hpp>
#include <boost/thread.hpp> //mutex
#include <linux/i2c-dev.h>
-#include <linux/i2c.h>
#include <stdexcept>
using namespace uhd;