diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-06-11 13:29:50 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-06-11 13:29:50 -0700 |
| commit | 16a3490e1bb71f18ca75afa80845100327ecb734 (patch) | |
| tree | a9a22ea8e25da831b06d44135f2435956abbc8e2 /host/include | |
| parent | 533548a681f0045f1194c4b47f857fa16314784d (diff) | |
| parent | 6508bd1d577ceec52e648882361421e548e196e6 (diff) | |
| download | uhd-16a3490e1bb71f18ca75afa80845100327ecb734.tar.gz uhd-16a3490e1bb71f18ca75afa80845100327ecb734.tar.bz2 uhd-16a3490e1bb71f18ca75afa80845100327ecb734.zip | |
Merge branch 'maint'
Conflicts:
host/include/uhd/usrp/multi_usrp.hpp
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp/multi_usrp.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index f0bb6d8d3..f9c2ee407 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -28,6 +28,7 @@ #define UHD_USRP_MULTI_USRP_USER_REGS_API #define UHD_USRP_MULTI_USRP_GET_USRP_INFO_API #define UHD_USRP_MULTI_USRP_NORMALIZED_GAIN +#define UHD_USRP_MULTI_USRP_GPIO_API #include <uhd/config.hpp> #include <uhd/device.hpp> |