From e536944f3f66ef3de3f7bd4d807e5d3ca77ee194 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Wed, 9 Jun 2010 16:27:08 -0700 Subject: [PATCH] --- yaml --- r: 200372 b: refs/heads/master c: 619baba195d92ec39379e24c151f4a640898d140 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 572b2b9fd3c8..570fe7dec852 100644 --- 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 index 1830f3199cb5..46c69cd06553 100644 --- 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);