diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2014-04-01 17:02:55 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-11 09:29:21 +0200 |
| commit | 41d09df1e08bf18316d08cb73c5d08b5346c0c5d (patch) | |
| tree | 71786dbe235e8c4821888773e403b870fa1b957b /net/rfkill | |
| parent | 04f1b47cd76ed525c87cc7c87a687e99d7f0e93d (diff) | |
| download | op-kernel-dev-41d09df1e08bf18316d08cb73c5d08b5346c0c5d.zip op-kernel-dev-41d09df1e08bf18316d08cb73c5d08b5346c0c5d.tar.gz | |
net: rfkill: gpio: add ACPI IDs for a Broadcom bluetooth chip
This adds ACPI IDs for Broadcom bluetooth chip BCM43241 used
on various Baytrail based boards such as Lenovo Miix 2 and
Asus Transformer Book T100TA.
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index fec3dbf..436bffb 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -171,11 +171,16 @@ static int rfkill_gpio_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_ACPI static const struct acpi_device_id rfkill_acpi_match[] = { + { "BCM2E1A", RFKILL_TYPE_BLUETOOTH }, + { "BCM2E39", RFKILL_TYPE_BLUETOOTH }, + { "BCM2E3D", RFKILL_TYPE_BLUETOOTH }, { "BCM4752", RFKILL_TYPE_GPS }, { "LNV4752", RFKILL_TYPE_GPS }, { }, }; +#endif static struct platform_driver rfkill_gpio_driver = { .probe = rfkill_gpio_probe, |
