summaryrefslogtreecommitdiffstats
path: root/host/docs/usrp2.rst
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2010-10-21 11:18:56 -0700
committerNick Foster <nick@nerdnetworks.org>2010-10-21 11:18:56 -0700
commit53412938fe7c851591026ef4c25233806f4f27a3 (patch)
tree0824ac4bab6ff987436093239388c8038a8125a5 /host/docs/usrp2.rst
parent2f6ab109231667ee255d2ba7cba34a0519019dc9 (diff)
parente2f76bddae7845024056b479658651c6da2b0f4d (diff)
downloaduhd-53412938fe7c851591026ef4c25233806f4f27a3.tar.gz
uhd-53412938fe7c851591026ef4c25233806f4f27a3.tar.bz2
uhd-53412938fe7c851591026ef4c25233806f4f27a3.zip
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts: host/lib/usrp/CMakeLists.txt
Diffstat (limited to 'host/docs/usrp2.rst')
-rw-r--r--host/docs/usrp2.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/docs/usrp2.rst b/host/docs/usrp2.rst
index 1ebab388a..0ddcaa4e5 100644
--- a/host/docs/usrp2.rst
+++ b/host/docs/usrp2.rst
@@ -158,7 +158,7 @@ The value for the addr key is a white-space separated list
of IPv4 addresses or resolvable hostnames.
The first address in the list will represent channel 0,
the second channel 1, and so on...
-Use this addressing scheme with the *mimo_usrp* interface.
+Use this addressing scheme with the *multi_usrp* interface.
The device address string representation for 2 USRP2s with IPv4 addresses 192.168.10.2 and 192.168.20.2
::