diff options
author | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2024-10-14 09:03:34 +0200 |
---|---|---|
committer | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2024-10-14 09:03:34 +0200 |
commit | bebb45743d52fea1ac0a4a9f465f11d11e885f40 (patch) | |
tree | a1dda3e26ac754e78cbb9734dae3f13f3a8adf39 /drivers/net/wireless/intel/iwlwifi/dvm/rx.c | |
parent | ea7f2dfd13e096dce3198e5ffdb00d21bf7c8fe5 (diff) | |
parent | 8e929cb546ee42c9a61d24fae60605e9e3192354 (diff) |
Merge tag 'v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Linux 6.12-rc3
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/rx.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c index e9d2717362cf..7f67e602940c 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c @@ -13,7 +13,7 @@ #include <linux/slab.h> #include <linux/sched.h> #include <net/mac80211.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include "iwl-trans.h" #include "iwl-io.h" |