diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-10 12:15:04 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-10 12:15:04 -0800 |
| commit | 80be2ec57a0fada29d04bd5cd0c102c622fac7a6 (patch) | |
| tree | 54bf666d4f1f1906116f9e7a39bbdc7c09fa1652 /host/lib/usrp/usrp_e100/CMakeLists.txt | |
| parent | 1275c37b96953c04191e9a5dd8747766c723b7e1 (diff) | |
| parent | 206a70cb823da9c338dcb83855a22ad251bb9cb7 (diff) | |
| download | uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.tar.gz uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.tar.bz2 uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.zip | |
Merge branch 'usrp_e100_devel' into next
Conflicts:
host/lib/usrp/usrp_e100/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp_e100/CMakeLists.txt')
| -rw-r--r-- | host/lib/usrp/usrp_e100/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp_e100/CMakeLists.txt b/host/lib/usrp/usrp_e100/CMakeLists.txt index c32dd87f8..acbac177e 100644 --- a/host/lib/usrp/usrp_e100/CMakeLists.txt +++ b/host/lib/usrp/usrp_e100/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2010 Ettus Research LLC +# Copyright 2010-2011 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ IF(ENABLE_USRP_E100) ${CMAKE_CURRENT_SOURCE_DIR}/dboard_impl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dsp_impl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fpga-downloader.cc + ${CMAKE_CURRENT_SOURCE_DIR}/fpga_downloader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mboard_impl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/usrp_e100_impl.cpp |