diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-03 20:52:41 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-03 20:52:41 +0200 |
commit | f2ff4da695a03122362c7e8ae8fca5fb9e1ff1e2 (patch) | |
tree | effe3e2808cf4ed83fd289ad5443d01a9855b21d /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | |
parent | 7a9a0a7371657cb81832bd547ceba9fe42b10a3e (diff) | |
parent | 6681bf218f9556b094e34f5f854b20d42d7e2e84 (diff) | |
download | kernel-f2ff4da695a03122362c7e8ae8fca5fb9e1ff1e2.tar.gz kernel-f2ff4da695a03122362c7e8ae8fca5fb9e1ff1e2.tar.xz kernel-f2ff4da695a03122362c7e8ae8fca5fb9e1ff1e2.zip |
merge originkernel-5.8.6-150.vanilla.knurd.1.fc31
Diffstat (limited to '0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch')
-rw-r--r-- | 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch index 8e740ce24..e679aeb55 100644 --- a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch +++ b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch @@ -15,10 +15,10 @@ Signed-off-by: Aaron Ma <aaron.ma@canonical.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c -index 735bf25952fc..15f6c0a4dc63 100644 +index 489bb5b59475..26bb39b62956 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c -@@ -1243,9 +1243,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) +@@ -1245,9 +1245,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) ew32(H2ME, mac_reg); } |