diff options
| author | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /net/rfkill/rfkill-gpio.c | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'net/rfkill/rfkill-gpio.c')
| -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 d5d58d919552..93127220cb54 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 },  |