Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-block.git] / drivers / net / s2io.h

diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 2d144979f6f863c5d8b16a62708f1f9816c6e2ea..628fd278866a3e2b931917d73465d714f118d4ec 100644 (file)
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -893,9 +893,6 @@ struct s2io_nic {
        u16 all_multi_pos;
        u16 promisc_flg;
 
-       /*  Id timer, used to blink NIC to physically identify NIC. */
-       struct timer_list id_timer;
-
        /*  Restart timer, used to restart NIC if the device is stuck and
         *  a schedule task that will set the correct Link state once the
         *  NIC's PHY has stabilized after a state change.