diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
| commit | 4378ad458441e1431ea3bdaafd8d663d3061f6f3 (patch) | |
| tree | 75dc6a1b06e80c051f39ce101b72c2c10b0e1b54 /host/lib/usrp/usrp1 | |
| parent | f84d7579aecaf2a90965331b200f6b298cd0c1d4 (diff) | |
| parent | 81e2262c9e41bbd3621c9753231e5eba23cd7292 (diff) | |
| download | uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.gz uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.bz2 uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.zip | |
Merge branch 'master' into next
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 1db2efa0d..33b40dd2f 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -214,7 +214,7 @@ usrp1_impl::usrp1_impl(const device_addr_t &device_addr){ _tree = property_tree::make(); _tree->create<std::string>("/name").set("USRP1 Device"); const fs_path mb_path = "/mboards/0"; - _tree->create<std::string>(mb_path / "name").set("USRP1 (Classic)"); + _tree->create<std::string>(mb_path / "name").set("USRP1"); _tree->create<std::string>(mb_path / "load_eeprom") .subscribe(boost::bind(&fx2_ctrl::usrp_load_eeprom, _fx2_ctrl, _1)); |