diff options
| author | Josh Blum <josh@joshknows.com> | 2012-03-23 14:41:08 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-03-23 14:41:08 -0700 |
| commit | 672da0df2d03a50f5bb824aa8d5d9512d040382f (patch) | |
| tree | 94391fb427c864a27a3c046cdc364bf57a0b0f12 /fpga/usrp2/control_lib/Makefile.srcs | |
| parent | 6acafe3a1762e434529569ad4164a03678996a9e (diff) | |
| parent | 6d70e5b3ad4c973a798dd00335fb8785b8c84ff3 (diff) | |
| download | uhd-672da0df2d03a50f5bb824aa8d5d9512d040382f.tar.gz uhd-672da0df2d03a50f5bb824aa8d5d9512d040382f.tar.bz2 uhd-672da0df2d03a50f5bb824aa8d5d9512d040382f.zip | |
Merge branch 'fpga_next' into next
Diffstat (limited to 'fpga/usrp2/control_lib/Makefile.srcs')
| -rw-r--r-- | fpga/usrp2/control_lib/Makefile.srcs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fpga/usrp2/control_lib/Makefile.srcs b/fpga/usrp2/control_lib/Makefile.srcs index 6ee7ea262..0bb9a3efe 100644 --- a/fpga/usrp2/control_lib/Makefile.srcs +++ b/fpga/usrp2/control_lib/Makefile.srcs @@ -55,4 +55,6 @@ atr_controller16.v \ fifo_to_wb.v \ gpio_atr.v \ user_settings.v \ +settings_fifo_ctrl.v \ +simple_spi_core.v \ )) |