diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-07 08:49:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-02-07 08:49:17 +0100 |
commit | 87a8d03266a55f18f31fdb71c28a8dcffe39124d (patch) | |
tree | ab337ca060871296a8dc5d47fcd45da9dcb17a3a /drivers/net/ethernet/amd/xgbe/xgbe.h | |
parent | efi/libstub: Preserve .debug sections after absolute relocation check (diff) | |
parent | Linux 4.10-rc7 (diff) | |
download | linux-dev-87a8d03266a55f18f31fdb71c28a8dcffe39124d.tar.xz linux-dev-87a8d03266a55f18f31fdb71c28a8dcffe39124d.zip |
Merge tag 'v4.10-rc7' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe/xgbe.h')
-rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h index f52a9bd05bac..00108815b55e 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h @@ -955,6 +955,8 @@ struct xgbe_prv_data { /* XPCS indirect addressing lock */ spinlock_t xpcs_lock; + unsigned int xpcs_window_def_reg; + unsigned int xpcs_window_sel_reg; unsigned int xpcs_window; unsigned int xpcs_window_size; unsigned int xpcs_window_mask; |