Merge branch 'linus'

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 941f12a333b6..1f1ce88c8186 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2402,7 +2402,6 @@ struct skge_hw {
 
         struct tasklet_struct ext_tasklet;
         spinlock_t           phy_lock;
-        spinlock_t           hw_lock;
 };
 
 enum {
@@ -2419,7 +2418,6 @@ struct skge_port {
         int                  port;
 
         spinlock_t           tx_lock;
-        u32                  tx_avail;
         struct skge_ring     tx_ring;
         struct skge_ring     rx_ring;