diff options
author | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:43:52 +0300 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:49:36 +0300 |
commit | 10f5ae21940cc754f82828d81b8009f2e8ae2c64 (patch) | |
tree | 8156f045504a2f9e1d767b0af6f89b19a4de2e52 /drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | |
parent | 7d528eafc5290bed18551a22ff25ce8587b603e0 (diff) | |
parent | f7e60032c6618dfd643c7210d5cba2789e2de2e2 (diff) | |
download | linux-10f5ae21940cc754f82828d81b8009f2e8ae2c64.tar.xz |
Merge wireless into wireless-next
There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h')
-rw-r--r-- | drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h index 9283119038b7..4695fb4e2d2d 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h @@ -1851,6 +1851,7 @@ struct rtl8xxxu_priv { u32 rege9c; u32 regeb4; u32 regebc; + u32 regrcr; int next_mbox; int nr_out_eps; |