diff --git a/[refs] b/[refs]
index dbbd5618fa15..f08028bb0c22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b1c29b4365d2eaf05eb81899cb1ca847dfe026e
+refs/heads/master: 4ad7a018cf4ac3cbad661c28c0f783ee0a6e3bf6
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index b8394cf134e8..ca6cf6ecb37b 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -414,9 +414,7 @@ static int gfar_suspend(struct platform_device *pdev, pm_message_t state)
 		spin_unlock(&priv->rxlock);
 		spin_unlock_irqrestore(&priv->txlock, flags);
 
-#ifdef CONFIG_GFAR_NAPI
 		napi_disable(&priv->napi);
-#endif
 
 		if (magic_packet) {
 			/* Enable interrupt on Magic Packet */
@@ -469,9 +467,7 @@ static int gfar_resume(struct platform_device *pdev)
 
 	netif_device_attach(dev);
 
-#ifdef CONFIG_GFAR_NAPI
 	napi_enable(&priv->napi);
-#endif
 
 	return 0;
 }