summaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-18 16:28:31 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-18 16:28:31 -0800
commita5db219f4cf9f67995eabd53b81a1232c82f5852 (patch)
tree5fffcb7ebd543b39468822963f9190fe6bf41bff /drivers/net/gianfar.c
parentc56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff)
parentff76015f3bdfbc482c723cb4f2559cef84d178ca (diff)
downloadop-kernel-dev-a5db219f4cf9f67995eabd53b81a1232c82f5852.zip
op-kernel-dev-a5db219f4cf9f67995eabd53b81a1232c82f5852.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 119aa20..5ed8f9f9 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1920,7 +1920,7 @@ int startup_gfar(struct net_device *ndev)
if (err) {
for (j = 0; j < i; j++)
free_grp_irqs(&priv->gfargrp[j]);
- goto irq_fail;
+ goto irq_fail;
}
}
OpenPOWER on IntegriCloud