diff options
author | David S. Miller <davem@davemloft.net> | 2015-08-17 15:41:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-17 15:41:21 -0700 |
commit | 0aa65cc0c2ca7e3908b1e4ae7946d909a4882249 (patch) | |
tree | a416d69dc0c389e4eade225dff076e4280fc6bb0 /net/rfkill | |
parent | 863960b4c5c564819b153d53cffdf3f68283eaa2 (diff) | |
parent | c0015bf3a34961342a27b021672049e535ab36a1 (diff) | |
download | op-kernel-dev-0aa65cc0c2ca7e3908b1e4ae7946d909a4882249.zip op-kernel-dev-0aa65cc0c2ca7e3908b1e4ae7946d909a4882249.tar.gz |
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-08-16
Here's what's likely the last bluetooth-next pull request for 4.3:
- 6lowpan/802.15.4 refactoring, cleanups & fixes
- Document 6lowpan netdev usage in Documentation/networking/6lowpan.txt
- Support for UART based QCA Bluetooth controllers
- Power management support for Broeadcom Bluetooth controllers
- Change LE connection initiation to always use passive scanning first
- Support for new Silicon Wave USB ID
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill')
-rw-r--r-- | net/rfkill/rfkill-gpio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index d5d58d9..9312722 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -164,7 +164,6 @@ static int rfkill_gpio_remove(struct platform_device *pdev) #ifdef CONFIG_ACPI static const struct acpi_device_id rfkill_acpi_match[] = { { "BCM2E1A", RFKILL_TYPE_BLUETOOTH }, - { "BCM2E39", RFKILL_TYPE_BLUETOOTH }, { "BCM2E3D", RFKILL_TYPE_BLUETOOTH }, { "BCM2E40", RFKILL_TYPE_BLUETOOTH }, { "BCM2E64", RFKILL_TYPE_BLUETOOTH }, |