diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-03-19 15:18:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-19 15:18:04 -0400 |
| commit | 970282d0e1404b23f9d7ec6a676fa76ff15b3376 (patch) | |
| tree | 15b7398383f5158cd19ba5fcbf17d46509e80a86 /include/linux | |
| parent | Merge branch 'tipc-next' (diff) | |
| parent | mac802154: fix typo in header guard (diff) | |
| download | linux-dev-970282d0e1404b23f9d7ec6a676fa76ff15b3376.tar.xz linux-dev-970282d0e1404b23f9d7ec6a676fa76ff15b3376.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-03-19
This wont the last 4.1 bluetooth-next pull request, but we've piled up
enough patches in less than a week that I wanted to save you from a
single huge "last-minute" pull somewhere closer to the merge window.
The main changes are:
- Simultaneous LE & BR/EDR discovery support for HW that can do it
- Complete LE OOB pairing support
- More fine-grained mgmt-command access control (normal user can now do
harmless read-only operations).
- Added RF power amplifier support in cc2520 ieee802154 driver
- Some cleanups/fixes in ieee802154 code
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/spi/cc2520.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/spi/cc2520.h b/include/linux/spi/cc2520.h index 85b8ee67e937..e741e8baad92 100644 --- a/include/linux/spi/cc2520.h +++ b/include/linux/spi/cc2520.h @@ -21,6 +21,7 @@ struct cc2520_platform_data { int sfd; int reset; int vreg; + bool amplified; }; #endif |