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/include | |
| 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/include')
| -rw-r--r-- | host/include/uhd/usrp/mboard_eeprom.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/include/uhd/usrp/mboard_eeprom.hpp b/host/include/uhd/usrp/mboard_eeprom.hpp index f44275aad..530b177be 100644 --- a/host/include/uhd/usrp/mboard_eeprom.hpp +++ b/host/include/uhd/usrp/mboard_eeprom.hpp @@ -36,8 +36,8 @@ namespace uhd{ namespace usrp{ //! Possible EEPROM maps types enum map_type{ - MAP_NXXX, - MAP_B1XX + MAP_N100, + MAP_B000 }; //! Make a new empty mboard eeprom |