Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad7a018 authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files

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: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 5b1c29b4

drivers/net/gianfar.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

}