diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-10-05 11:53:43 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-10-05 11:53:43 -0700 |
| commit | 92fdf6ab255cc07091bbdb59e7eb5e57553115ba (patch) | |
| tree | 8841360082d1e0b48b44b424205ca0295a493b98 /host/lib/ic_reg_maps | |
| parent | e4d088fa9169eef81473cb7d83bda7c82bc5d243 (diff) | |
| download | uhd-92fdf6ab255cc07091bbdb59e7eb5e57553115ba.tar.gz uhd-92fdf6ab255cc07091bbdb59e7eb5e57553115ba.tar.bz2 uhd-92fdf6ab255cc07091bbdb59e7eb5e57553115ba.zip | |
U2P: 32/64Mbit FLASH support, internal reference support for U2P r2
Diffstat (limited to 'host/lib/ic_reg_maps')
| -rw-r--r-- | host/lib/ic_reg_maps/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/ic_reg_maps/CMakeLists.txt b/host/lib/ic_reg_maps/CMakeLists.txt index 507f214c9..772166334 100644 --- a/host/lib/ic_reg_maps/CMakeLists.txt +++ b/host/lib/ic_reg_maps/CMakeLists.txt @@ -70,11 +70,11 @@ LIBUHD_PYTHON_GEN_SOURCE( ) LIBUHD_PYTHON_GEN_SOURCE( -<<<<<<< HEAD ${CMAKE_SOURCE_DIR}/lib/ic_reg_maps/gen_ads62p44_regs.py ${CMAKE_BINARY_DIR}/lib/ic_reg_maps/ads62p44_regs.hpp -======= + ) + +LIBUHD_PYTHON_GEN_SOURCE( ${CMAKE_SOURCE_DIR}/lib/ic_reg_maps/gen_tuner_4937di5_regs.py ${CMAKE_BINARY_DIR}/lib/ic_reg_maps/tuner_4937di5_regs.hpp ->>>>>>> bd3bd0dfbc1a87af5839c9b23450434cfb9c763c ) |