The trivial patch forwarded below still applies and compiles against 2.6.9-rc4-mm1. Please apply. ----- Forwarded message from Adrian Bunk <bunk@stusta.de> ----- Date: Thu, 7 Oct 2004 22:58:18 +0200 From: Adrian Bunk <bunk@stusta.de> To: jgarzik@pobox.com, mikep@linuxtr.net, p2@ace.ulyssis.student.kuleuven.ac.be Cc: linux-net@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [2.6 patch] net/tokenring/olympic.c: remove unused variable Recent changes in Linus' tree removed all uses of a variable, resulting in the following warning: <-- snip --> ... CC drivers/net/tokenring/olympic.o drivers/net/tokenring/olympic.c: In function `olympic_arb_cmd': drivers/net/tokenring/olympic.c:1404: warning: unused variable `i' ... <-- snip --> The following patch removes this unused variable: Signed-off-by: Adrian Bunk <bunk@stusta.de> --- linux-2.6.9-rc3-mm3/drivers/net/tokenring/olympic.c.old 2004-10-07 22:52:02.000000000 +0200 +++ linux-2.6.9-rc3-mm3/drivers/net/tokenring/olympic.c 2004-10-07 22:53:15.000000000 +0200 @@ -1401,7 +1401,6 @@ u16 lan_status = 0, lan_status_diff ; /* Initialize to stop compiler warning */ u8 fdx_prot_error ; u16 next_ptr; - int i ; arb_block = (olympic_priv->olympic_lap + olympic_priv->arb) ; asb_block = (olympic_priv->olympic_lap + olympic_priv->asb) ; - : send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ ----- End forwarded message ----- - : send the line "unsubscribe linux-net" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html