diff --git a/[refs] b/[refs] index db9d6f304a42..bd9d5c9d2b57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a710b59a93d5fa3f02283491084fc37e042fdc1 +refs/heads/master: c5f978eddd07aa9e2d4f5b2994ea8c9d4e9109aa diff --git a/trunk/drivers/net/cassini.h b/trunk/drivers/net/cassini.h index fd17a002b453..dbc47878d83b 100644 --- a/trunk/drivers/net/cassini.h +++ b/trunk/drivers/net/cassini.h @@ -2844,10 +2844,6 @@ struct cas { atomic_t reset_task_pending_all; #endif -#ifdef CONFIG_CASSINI_QGE_DEBUG - atomic_t interrupt_seen; /* 1 if any interrupts are getting through */ -#endif - /* Link-down problem workaround */ #define LINK_TRANSITION_UNKNOWN 0 #define LINK_TRANSITION_ON_FAILURE 1