upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / net / tokenring / olympic.c

diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 1ec45b2..654b931 100644 (file)
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -99,12 +99,12 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <net/checksum.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 #include "olympic.h"
 
@@ -1401,7 +1401,6 @@ static void olympic_arb_cmd(struct net_device *dev)
        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) ;