---

yaml --- r: 200372 b: refs/heads/master c: 619baba h: refs/heads/master v: v3
git-mirror · Jun 9, 2010 · e536944 · e536944
1 parent 070af77
commit e536944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aea34e7ae7a40bc72f9f11b5658160dfb4b90c48
+refs/heads/master: 619baba195d92ec39379e24c151f4a640898d140
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
@@ -747,8 +747,7 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
 			FSL_GIANFAR_DEV_HAS_CSUM |
 			FSL_GIANFAR_DEV_HAS_VLAN |
 			FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
-			FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
-			FSL_GIANFAR_DEV_HAS_TIMER;
+			FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
 
 	ctype = of_get_property(np, "phy-connection-type", NULL);