diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
| commit | df69471290cbec7714f6d1fabd14f4e41219cee1 (patch) | |
| tree | 1a8d9d3fce98db7b4382c24994feba6fa771805f /drivers/net/atlx/atl1.c | |
| parent | d994af0d50efc96b2077978fe9f066992639d525 (diff) | |
| parent | 17393dd67c06c3912ff47b31268b648929715336 (diff) | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/atlx/atl1.c')
| -rw-r--r-- | drivers/net/atlx/atl1.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index e6a7bb79d4df..e23ce77712f1 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
| @@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev, | |||
| 3022 | netdev->features = NETIF_F_HW_CSUM; | 3022 | netdev->features = NETIF_F_HW_CSUM; |
| 3023 | netdev->features |= NETIF_F_SG; | 3023 | netdev->features |= NETIF_F_SG; |
| 3024 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); | 3024 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); |
| 3025 | netdev->features |= NETIF_F_TSO; | ||
| 3026 | netdev->features |= NETIF_F_LLTX; | 3025 | netdev->features |= NETIF_F_LLTX; |
| 3027 | 3026 | ||
| 3028 | /* | 3027 | /* |