diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-26 17:54:41 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-26 17:54:41 -0700 |
| commit | 3ff2780a82eed3bbca8f6a9f52f31746de42ea40 (patch) | |
| tree | f11a4056ccdba38ea1cc342ee5e265307c50851b /host/include | |
| parent | 190d7cd9d5206113fad22111107034cb52c3c28b (diff) | |
| parent | 1a81e2a35ff1d288e87eb1e65911c1a97588217c (diff) | |
| download | uhd-3ff2780a82eed3bbca8f6a9f52f31746de42ea40.tar.gz uhd-3ff2780a82eed3bbca8f6a9f52f31746de42ea40.tar.bz2 uhd-3ff2780a82eed3bbca8f6a9f52f31746de42ea40.zip | |
Merge branch 'gdb_support'
Conflicts:
host/lib/usrp/dboard/CMakeLists.txt
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp/dboard_props.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/include/uhd/usrp/dboard_props.hpp b/host/include/uhd/usrp/dboard_props.hpp index 35721ab47..29211ec8c 100644 --- a/host/include/uhd/usrp/dboard_props.hpp +++ b/host/include/uhd/usrp/dboard_props.hpp @@ -32,6 +32,7 @@ namespace uhd{ namespace usrp{ DBOARD_PROP_SUBDEV, //ro, wax::obj DBOARD_PROP_SUBDEV_NAMES, //ro, prop_names_t DBOARD_PROP_DBOARD_EEPROM, //rw, dboard_eeprom_t + DBOARD_PROP_GBOARD_EEPROM, //rw, dboard_eeprom_t DBOARD_PROP_DBOARD_IFACE, //ro, dboard_iface::sptr DBOARD_PROP_CODEC, //ro, wax::obj DBOARD_PROP_GAIN_GROUP //ro, gain_group |