diff options
author | Li Yang <leoli@freescale.com> | 2007-10-12 09:53:51 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-15 14:41:34 -0400 |
commit | 94e8cc35bc300ccae91b08587029291d1ca001d6 (patch) | |
tree | 171d93e8a178b63bf9ebe8d23b0cb63dbd827676 /drivers/net | |
parent | 25b31cb118f399e9996ed7a3766b86c69a6bb07e (diff) |
gianfar: Fix compile regression caused by bea3348e
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/gianfar.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 0db5e6fabe73..2b758fa334d3 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -261,7 +261,9 @@ static int gfar_probe(struct platform_device *pdev) | |||
261 | dev->hard_start_xmit = gfar_start_xmit; | 261 | dev->hard_start_xmit = gfar_start_xmit; |
262 | dev->tx_timeout = gfar_timeout; | 262 | dev->tx_timeout = gfar_timeout; |
263 | dev->watchdog_timeo = TX_TIMEOUT; | 263 | dev->watchdog_timeo = TX_TIMEOUT; |
264 | #ifdef CONFIG_GFAR_NAPI | ||
264 | netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT); | 265 | netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT); |
266 | #endif | ||
265 | #ifdef CONFIG_NET_POLL_CONTROLLER | 267 | #ifdef CONFIG_NET_POLL_CONTROLLER |
266 | dev->poll_controller = gfar_netpoll; | 268 | dev->poll_controller = gfar_netpoll; |
267 | #endif | 269 | #endif |
@@ -931,6 +933,7 @@ tx_skb_fail: | |||
931 | /* Returns 0 for success. */ | 933 | /* Returns 0 for success. */ |
932 | static int gfar_enet_open(struct net_device *dev) | 934 | static int gfar_enet_open(struct net_device *dev) |
933 | { | 935 | { |
936 | struct gfar_private *priv = netdev_priv(dev); | ||
934 | int err; | 937 | int err; |
935 | 938 | ||
936 | napi_enable(&priv->napi); | 939 | napi_enable(&priv->napi); |