diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-30 16:16:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-30 16:16:43 -0700 |
| commit | 29a3060aa7cc2e5cfaabeb935fafb832b9b33ad4 (patch) | |
| tree | 326179bc399ee9deceaf3b738d420d384f134f7a /drivers/net/ieee802154/cc2520.c | |
| parent | 8013d1d7eafb0589ca766db6b74026f76b7f5cb4 (diff) | |
| parent | 5857d1dbae7d5bf4219efc39996ad002362a2951 (diff) | |
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-07-30
Here's a set of Bluetooth & 802.15.4 patches intended for the 4.3 kernel.
- Cleanups & fixes to mac802154
- Refactoring of Intel Bluetooth HCI driver
- Various coding style fixes to Bluetooth HCI drivers
- Support for Intel Lightning Peak Bluetooth devices
- Generic class code in interface descriptor in btusb to match more HW
- Refactoring of Bluetooth HS code together with a new config option
- Support for BCM4330B1 Broadcom UART controller
Let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ieee802154/cc2520.c')
| -rw-r--r-- | drivers/net/ieee802154/cc2520.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c index b6fc29579667..613dae559925 100644 --- a/drivers/net/ieee802154/cc2520.c +++ b/drivers/net/ieee802154/cc2520.c @@ -1151,7 +1151,6 @@ MODULE_DEVICE_TABLE(of, cc2520_of_ids); static struct spi_driver cc2520_driver = { .driver = { .name = "cc2520", - .bus = &spi_bus_type, .owner = THIS_MODULE, .of_match_table = of_match_ptr(cc2520_of_ids), }, |