diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-10 11:27:42 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-10 11:27:42 -0800 |
| commit | 123de6dad521ca3dbc44a5d9fc70ff754f1196e3 (patch) | |
| tree | 53f03bfd7a33e85646c5c21ad685e48202789eb5 /host/lib/usrp/usrp2/usrp2_iface.cpp | |
| parent | 793519d66aa569f45bbda25ba7f36c1534a451bb (diff) | |
| parent | 8c434f7d63aca25b55d6d13dffcc1d7037261d4f (diff) | |
| download | uhd-123de6dad521ca3dbc44a5d9fc70ff754f1196e3.tar.gz uhd-123de6dad521ca3dbc44a5d9fc70ff754f1196e3.tar.bz2 uhd-123de6dad521ca3dbc44a5d9fc70ff754f1196e3.zip | |
Merge branch 'master' into usrp_e100_i2c
Conflicts:
host/utils/CMakeLists.txt
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index eb2685efa..09f3432d6 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -60,7 +60,7 @@ public: ) % int(USRP2_FPGA_COMPAT_NUM) % fpga_compat_num)); } - mb_eeprom = mboard_eeprom_t(*this, mboard_eeprom_t::MAP_NXXX); + mb_eeprom = mboard_eeprom_t(*this, mboard_eeprom_t::MAP_N100); } ~usrp2_iface_impl(void){ |