Skip to content

Commit

Permalink
remove bogus CONFIG_GFAR_NAPI's
Browse files Browse the repository at this point in the history
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@crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Adrian Bunk authored and Jeff Garzik committed Aug 7, 2008
1 parent 5b1c29b commit 4ad7a01
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/net/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 4ad7a01

Please sign in to comment.