diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-14 15:06:38 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-14 15:06:38 +0100 |
commit | 4cc893176cf6ba0b0f53287d3c306862e058225a (patch) | |
tree | 77c08cfc72114cec4a88e7cf620135e080125440 /drivers/net/wireless/intel/Makefile | |
parent | b25c7dc13fb8842e8634bd846a7a96f2176f0244 (diff) | |
parent | 09688c0166e76ce2fb85e86b9d99be8b0084cdf9 (diff) |
Merge 5.17-rc8 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/intel/Makefile')
-rw-r--r-- | drivers/net/wireless/intel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/Makefile b/drivers/net/wireless/intel/Makefile index 1364b0014488..208e73a16051 100644 --- a/drivers/net/wireless/intel/Makefile +++ b/drivers/net/wireless/intel/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_IPW2200) += ipw2x00/ obj-$(CONFIG_IWLEGACY) += iwlegacy/ obj-$(CONFIG_IWLWIFI) += iwlwifi/ +obj-$(CONFIG_IWLMEI) += iwlwifi/ |