Merge branch 'rfx' of git@ettus.sourcerepo.com:ettus/uhd into io

Conflicts:
	host/lib/usrp/usrp2/io_impl.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index e971e9f6a..d49f7d182 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -86,8 +86,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         );
         if (num_rx_samps == 0) continue; //wait for packets with contents
 
-        std::cout << boost::format("Got packet: %u samples, %u secs, %u ticks")
-            % num_rx_samps % md.time_spec.secs % md.time_spec.ticks << std::endl;
+        std::cout << boost::format("Got packet: %u samples, %u secs, %u nsecs")
+            % num_rx_samps % md.time_spec.secs % md.time_spec.nsecs << std::endl;
 
         num_acc_samps += num_rx_samps;
     }