Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6

[mv-sheeva.git] / drivers / net / bnx2.h

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 1eaf5bb3d9c2233f12b2861445af1a714cfa9625..2377cc13bf61afc14d7598eaa93cf78a691204a7 100644 (file)
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6656,7 +6656,6 @@ struct bnx2 {
        int                     current_interval;
        struct                  timer_list timer;
        struct work_struct      reset_task;
-       int                     in_reset_task;
 
        /* Used to synchronize phy accesses. */
        spinlock_t              phy_lock;