summaryrefslogtreecommitdiffstats
path: root/net/rfkill
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-09-03 22:12:02 -0700
committerDavid S. Miller <davem@davemloft.net>2018-09-03 22:12:02 -0700
commitfc3e3bf55f48e5b18481075b0591ca938c9dba78 (patch)
tree17541ce7f404c33f51048576d7cdeef436ee95e6 /net/rfkill
parenta484ef3442d2f05fa59edf4f6d14a8169d1b94a6 (diff)
parentc6e57b3896fc76299913b8cfd82d853bee8a2c84 (diff)
downloadlinux-fc3e3bf55f48e5b18481075b0591ca938c9dba78.tar.bz2
Merge tag 'mac80211-for-davem-2018-09-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says: ==================== Here are quite a large number of fixes, notably: * various A-MSDU building fixes (currently only affects mt76) * syzkaller & spectre fixes in hwsim * TXQ vs. teardown fix that was causing crashes * embed WMM info in reg rule, bad code here had been causing crashes * one compilation issue with fix from Arnd (rfkill-gpio includes) * fixes for a race and bad data during/after channel switch * nl80211: a validation fix, attribute type & unit fixes along with other small fixes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill')
-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 00192a996be0..0f8465852254 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/mod_devicetable.h>
#include <linux/rfkill.h>
#include <linux/platform_device.h>
#include <linux/clk.h>