BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: hci_bcm: move all Broadcom ACPI IDs to BCM HCI driver

Browse Source 
The IDs should all be for Broadcom BCM43241 module, and
hci_bcm is now the proper driver for them. This removes one
of two different ways of handling PM with the module.

Cc: Johannes Berg <[email protected]>
Signed-off-by: Heikki Krogerus <[email protected]>
Signed-off-by: Marcel Holtmann <[email protected]>
This commit is contained in:
Heikki Krogerus authored and Marcel Holtmann committed 2016-01-04 19:22:05 +01:00
1 parent 59869ebfe7
commit d3d2072540
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

drivers/bluetooth/hci_bcm.c
+4
View File
@@ -814,7 +814,11 @@ static const struct hci_uart_proto bcm_proto = {
#ifdef CONFIG_ACPI
static const struct acpi_device_id bcm_acpi_match[] = {
{ "BCM2E1A", 0 },
{ "BCM2E39", 0 },
{ "BCM2E3D", 0 },
{ "BCM2E40", 0 },
{ "BCM2E64", 0 },
{ "BCM2E65", 0 },
{ "BCM2E67", 0 },
{ },
net/rfkill/rfkill-gpio.c
-4
View File
@@ -163,10 +163,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 },
{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
{ "BCM2E40", RFKILL_TYPE_BLUETOOTH },
{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
{ "BCM4752", RFKILL_TYPE_GPS },
{ "LNV4752", RFKILL_TYPE_GPS },
{ },