diff options
| author | Tom Rondeau | 2012-02-14 19:43:51 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-14 19:43:51 -0500 |
| commit | 4f0b3fbe765b9f4ce744e2c2c182715fc63756e2 (patch) | |
| tree | 93665d11dbbec89ab376d4aead5ff321644f64ba /volk/include | |
| parent | ba3f1a4e8d5879c91eb5c47cc7e7c3ac73b1989d (diff) | |
| parent | 2eaa0a6e1e57cfc374c258c317ecb469fc49bf53 (diff) | |
| download | gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.tar.gz gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.tar.bz2 gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.zip | |
Merge branch 'safe_align' of vortex.corganenterprises.com:gnuradio-trondeau into safe_align
Diffstat (limited to 'volk/include')
| -rw-r--r-- | volk/include/volk/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am index f6b5835b1..a01ddf193 100644 --- a/volk/include/volk/Makefile.am +++ b/volk/include/volk/Makefile.am @@ -59,8 +59,8 @@ volkinclude_HEADERS = \ volk_32fc_32f_multiply_32fc_a.h \ volk_32fc_s32fc_multiply_32fc_a.h \ volk_32fc_s32fc_multiply_32fc_u.h \ - volk_32fc_s32fc_multiply_conjugate_32fc_a.h \ - volk_32fc_s32fc_multiply_conjugate_32fc_u.h \ + volk_32fc_x2_multiply_conjugate_32fc_a.h \ + volk_32fc_x2_multiply_conjugate_32fc_u.h \ volk_32fc_s32f_power_32fc_a.h \ volk_32f_s32f_calc_spectral_noise_floor_32f_a.h \ volk_32fc_s32f_atan2_32f_a.h \ |