aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1/clock_ctrl.cpp
diff options
context:
space:
mode:
authorThomas Tsou <ttsou@vt.edu>2010-08-26 12:33:06 -0700
committerThomas Tsou <ttsou@vt.edu>2010-08-26 12:33:06 -0700
commit4434e8233fadc4eec81d345a6c4e63922d8c01ab (patch)
tree392a85fc9f11f230eeb0cc8d0a17fdaa819b74bd /host/lib/usrp/usrp1/clock_ctrl.cpp
parent2f3269f359043290fcaa7659e90292919306a8bc (diff)
parentfe7df530e69834e974108d2c3e682f38b8a75524 (diff)
downloaduhd-4434e8233fadc4eec81d345a6c4e63922d8c01ab.tar.gz
uhd-4434e8233fadc4eec81d345a6c4e63922d8c01ab.tar.bz2
uhd-4434e8233fadc4eec81d345a6c4e63922d8c01ab.zip
Merge branch 'usrp1_next' into usrp1
Diffstat (limited to 'host/lib/usrp/usrp1/clock_ctrl.cpp')
-rw-r--r--host/lib/usrp/usrp1/clock_ctrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/clock_ctrl.cpp b/host/lib/usrp/usrp1/clock_ctrl.cpp
index c83ad4c68..54f7b0b98 100644
--- a/host/lib/usrp/usrp1/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp1/clock_ctrl.cpp
@@ -64,7 +64,7 @@ public:
rates.push_back(master_clock_rate / div);
return rates;
#else
- return std::vector<double>(1, 64e6);
+ return std::vector<double>(1, master_clock_rate);
#endif
}