From e2d0ad4b93ef876ce404b18e076d8924d7f25594 Mon Sep 17 00:00:00 2001
From: Li Yang <leoli@freescale.com>
Date: Fri, 12 Oct 2007 21:53:51 +0800
Subject: [PATCH] --- yaml --- r: 69336 b: refs/heads/master c:
 94e8cc35bc300ccae91b08587029291d1ca001d6 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/gianfar.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc9c54285549..12fbcc58e391 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25b31cb118f399e9996ed7a3766b86c69a6bb07e
+refs/heads/master: 94e8cc35bc300ccae91b08587029291d1ca001d6
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index 0db5e6fabe73..2b758fa334d3 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -261,7 +261,9 @@ static int gfar_probe(struct platform_device *pdev)
 	dev->hard_start_xmit = gfar_start_xmit;
 	dev->tx_timeout = gfar_timeout;
 	dev->watchdog_timeo = TX_TIMEOUT;
+#ifdef CONFIG_GFAR_NAPI
 	netif_napi_add(dev, &priv->napi, gfar_poll, GFAR_DEV_WEIGHT);
+#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
 	dev->poll_controller = gfar_netpoll;
 #endif
@@ -931,6 +933,7 @@ int startup_gfar(struct net_device *dev)
 /* Returns 0 for success. */
 static int gfar_enet_open(struct net_device *dev)
 {
+	struct gfar_private *priv = netdev_priv(dev);
 	int err;
 
 	napi_enable(&priv->napi);