[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080804085936.GB6088@cs181140183.pp.htv.fi>
Date: Mon, 4 Aug 2008 11:59:36 +0300
From: Adrian Bunk <bunk@...nel.org>
To: Francois Romieu <romieu@...zoreil.com>,
Scott Wood <scottwood@...escale.com>,
Kumar Gala <galak@...nel.crashing.org>,
Jeff Garzik <jeff@...zik.org>
Cc: netdev@...r.kernel.org, "Robert P. J. Day" <rpjday@...shcourse.ca>
Subject: [2.6 patch] remove bogus CONFIG_GFAR_NAPI's
The commit that made the CONFIG_GFAR_NAPI code unconditional was
included at the same time as a new CONFIG_GFAR_NAPI user, resulting
in these bugus #ifdef's.
Reported-by: Robert P. J. Day <rpjday@...shcourse.ca>
Signed-off-by: Adrian Bunk <bunk@...nel.org>
---
drivers/net/gianfar.c | 4 ----
1 file changed, 4 deletions(-)
f30b77c42e33dee1d469a1f1fd0fcfd9cdc26761
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index b8394cf..ca6cf6e 100644
--- a/drivers/net/gianfar.c
+++ b/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;
}
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists