summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-09-19 16:33:15 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-19 16:33:15 -0400
commit8f665f6cb7f6d265e77bd6892c5f36dd3ccba586 (patch)
treee4678cf15e7399260be5546fc72ed8ab9f2c8f41 /net
parent8400dd029e764e30361a51a7ae35900ae0032b43 (diff)
parentdda3b191eb6c5a56d443723dcb71ade60d97c04f (diff)
downloadop-kernel-dev-8f665f6cb7f6d265e77bd6892c5f36dd3ccba586.zip
op-kernel-dev-8f665f6cb7f6d265e77bd6892c5f36dd3ccba586.tar.gz
Merge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== pull request: wireless 2014-09-17 Please pull this batch of fixes intended for the 3.17 stream... Arend van Spriel sends a trio of minor brcmfmac fixes, including a fix for a Kconfig/build issue, a fix for a crash (null reference), and a regression fix related to event handling on a P2P interface. Hante Meuleman follows-up with a brcmfmac fix for a memory leak. Johannes Stezenbach brings an ath9k_htc fix for a regression related to hardware decryption offload. Marcel Holtmann delivers a one-liner to properly mark a device ID table in rfkill-gpio. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/rfkill/rfkill-gpio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 02a86a2..5fa54dd 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -163,6 +163,7 @@ static const struct acpi_device_id rfkill_acpi_match[] = {
{ "LNV4752", RFKILL_TYPE_GPS },
{ },
};
+MODULE_DEVICE_TABLE(acpi, rfkill_acpi_match);
#endif
static struct platform_driver rfkill_gpio_driver = {
OpenPOWER on IntegriCloud