diff options
| author | Matt Ettus <matt@ettus.com> | 2010-01-25 13:24:53 -0800 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-01-25 13:24:53 -0800 |
| commit | 058780d92f776bcba0a384b5e4c4aa948d64c6f4 (patch) | |
| tree | 265ec9cbeb67bdbc0529b22209eb37f57008dc25 /usrp2/top/u2_rev3 | |
| parent | a8ceedc34bb66c870964e4430c098a2cdaf9d429 (diff) | |
| parent | 8d19387a8642caf74179bdcb7eddf1936f473e53 (diff) | |
| download | uhd-058780d92f776bcba0a384b5e4c4aa948d64c6f4.tar.gz uhd-058780d92f776bcba0a384b5e4c4aa948d64c6f4.tar.bz2 uhd-058780d92f776bcba0a384b5e4c4aa948d64c6f4.zip | |
Merge commit '8d19387a8642caf74179bdcb7eddf1936f473e53' into udp
Merge latest VRT changes into UDP branch. Merged from 1 behind the
head of VRT because the head moved things around and confused git
Conflicts:
usrp2/timing/time_64bit.v
usrp2/top/u2_core/u2_core.v
Diffstat (limited to 'usrp2/top/u2_rev3')
| -rw-r--r-- | usrp2/top/u2_rev3/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usrp2/top/u2_rev3/Makefile b/usrp2/top/u2_rev3/Makefile index d27469f47..1fd8638d9 100644 --- a/usrp2/top/u2_rev3/Makefile +++ b/usrp2/top/u2_rev3/Makefile @@ -190,8 +190,7 @@ timing/time_64bit.v \ timing/time_compare.v \ timing/time_receiver.v \ timing/time_sender.v \ -timing/time_sync.v \ -timing/timer.v \ +timing/simple_timer.v \ top/u2_core/u2_core.v \ top/u2_rev3/u2_rev3.ucf \ top/u2_rev3/u2_rev3.v |