diff options
| author | Alice Michael <alice.michael@intel.com> | 2017-08-29 12:32:36 +0300 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2017-10-06 18:11:31 +0300 |
| commit | 7f6618226360b4aa0230a49525c81bf47d1d53c8 (patch) | |
| tree | cd6adb7d6bf830ec203bbf06b5ed696c86431d6a /drivers/net/ethernet/intel/i40e/i40e.h | |
| parent | bd6cd4e6dd38a35215d3f28f12db51213c9aead6 (diff) | |
| download | linux-7f6618226360b4aa0230a49525c81bf47d1d53c8.tar.xz | |
i40e: fix merge error
This patch removes some code that was accidentally added to
the wrong function with a merge error. Fixes: c53934c6d1b1
("i40e: fix: do not sleep in netdev_ops")
Signed-off-by: Alice Michael <alice.michael@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e.h')
0 files changed, 0 insertions, 0 deletions