---

yaml --- r: 210582 b: refs/heads/master c: de2b96f h: refs/heads/master v: v3
git-mirror · Sep 7, 2010 · 247ff98 · 247ff98
1 parent ce3b187
commit 247ff98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f86b325189e0a53c97bf86cff0c8b02ff624934
+refs/heads/master: de2b96f1212722eb0af80bf9a029d03d8fc673a9
diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c
@@ -2824,7 +2824,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
 	netif_napi_add(dev, &vptr->napi, velocity_poll, VELOCITY_NAPI_WEIGHT);
 
 	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER |
-		NETIF_F_HW_VLAN_RX | NETIF_F_IP_CSUM | NETIF_F_SG;
+		NETIF_F_HW_VLAN_RX | NETIF_F_IP_CSUM;
 
 	ret = register_netdev(dev);
 	if (ret < 0)