e1000e: Fix merge conflict (net->net-next)

Browse source

During merge of net to net-next the changes in patch:

e1000e: Fix default interrupt throttle rate not set in NIC HW

got munged in param.c of the e1000e driver.  This rectifies the
merge issues.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Jeff Kirsher 2012-05-09 02:23:46 -07:00 • committed by David S. Miller

parent 9bb862beb6

commit 2e7d21c54a

1 changed files with 11 additions and 45 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

56

drivers/net/ethernet/intel/e1000e/param.c

View file