diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-04 14:57:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-04 14:57:45 -0800 |
| commit | 940288b6a560710d4c63bc84d9570779dd7dec2b (patch) | |
| tree | 349a41e8d8d75239428efcfd299d4b680cc839a1 /net/rfkill | |
| parent | 541c571fa2fdfd4782d840276c5aedb535349075 (diff) | |
| parent | 79044f60caa7c377333dc8f13cf1e48c144e2521 (diff) | |
| download | linux-940288b6a560710d4c63bc84d9570779dd7dec2b.tar.gz linux-940288b6a560710d4c63bc84d9570779dd7dec2b.tar.bz2 linux-940288b6a560710d4c63bc84d9570779dd7dec2b.zip | |
Merge tag 'mac80211-next-for-davem-2015-02-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Last round of updates for net-next:
* revert a patch that caused a regression with mesh userspace (Bob)
* fix a number of suspend/resume related races
(from Emmanuel, Luca and myself - we'll look at backporting later)
* add software implementations for new ciphers (Jouni)
* add a new ACPI ID for Broadcom's rfkill (Mika)
* allow using netns FD for wireless (Vadim)
* some other cleanups (various)
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, 1 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 3f4a0bbeed3d..d978f2f46ff3 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -170,6 +170,7 @@ 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 }, { "BCM4752", RFKILL_TYPE_GPS }, { "LNV4752", RFKILL_TYPE_GPS }, |