Arthur Jones 3f518390ab e1000e: fixup merge error ...

When merging into Jeff's tree:

	commit 5f66f208064f083aab5e55935d0575892e033b59
	Author: Arthur Jones <ajones@riverbed.com>
	Date:   Thu Mar 19 01:13:08 2009 +0000

	    e1000e: allow tx of pre-formatted vlan tagged packets

We lost one line, this fixes that missing
piece...

Signed-off-by: Arthur Jones <ajones@riverbed.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2009-03-20 15:56:35 -07:00

..

82571.c

e1000e: add support for 82583 device id

2009-03-20 01:17:18 -07:00

defines.h

e1000e: Disable dynamic clock gating for 82571 per si errata.

2009-02-10 17:00:27 -08:00

e1000.h

e1000e: add support for 82583 device id

2009-03-20 01:17:18 -07:00

es2lan.c

drivers/net/e1000e: fix sparse warnings: make symbols static

2008-12-26 00:00:37 -08:00

ethtool.c

e1000e: add support for 82583 device id

2009-03-20 01:17:18 -07:00

hw.h

e1000e: add support for 82583 device id

2009-03-20 01:17:18 -07:00

ich8lan.c

e1000e: Remove mutex_trylock and associated WARN on failure.

2009-02-14 23:46:10 -08:00

lib.c

e1000e: normalize usage of serdes_has_link

2009-02-05 23:55:45 -08:00

Makefile

e1000e: reformat comment blocks, cosmetic changes only

2008-03-28 22:14:56 -04:00

netdev.c

e1000e: fixup merge error

2009-03-20 15:56:35 -07:00

param.c

e1000e: fix IPMI traffic

2008-11-16 19:05:16 -08:00

phy.c

e1000e: sync change flow control variables with ixgbe

2008-11-21 16:57:36 -08:00