diff options
| author | michael-west <michael.west@ettus.com> | 2014-07-30 11:54:26 -0700 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2014-07-30 11:54:26 -0700 |
| commit | 35fc42f9fcbc5a791bdabc92086a51a2279563f1 (patch) | |
| tree | fd053dd7e462fd49759ae255334de6d5c5aefd59 /fpga/usrp3/lib/timing/Makefile.srcs | |
| parent | bca5edb57979983a9eb8d6cd1016961552ad217c (diff) | |
| parent | eafae66c030aa86e9da127de4f6d5ec4fd641c59 (diff) | |
| download | uhd-35fc42f9fcbc5a791bdabc92086a51a2279563f1.tar.gz uhd-35fc42f9fcbc5a791bdabc92086a51a2279563f1.tar.bz2 uhd-35fc42f9fcbc5a791bdabc92086a51a2279563f1.zip | |
Merge branch 'maint' into uhd/bug492
Conflicts:
host/lib/usrp/b200/b200_impl.cpp
Diffstat (limited to 'fpga/usrp3/lib/timing/Makefile.srcs')
| -rw-r--r-- | fpga/usrp3/lib/timing/Makefile.srcs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fpga/usrp3/lib/timing/Makefile.srcs b/fpga/usrp3/lib/timing/Makefile.srcs index ff4ca17d2..09f0596c5 100644 --- a/fpga/usrp3/lib/timing/Makefile.srcs +++ b/fpga/usrp3/lib/timing/Makefile.srcs @@ -8,4 +8,5 @@ TIMING_SRCS = $(abspath $(addprefix $(BASE_DIR)/../lib/timing/, \ time_compare.v \ timekeeper.v \ +pps.v\ )) |