Merge branch 'upstream'

[linux-2.6] / drivers / net / skge.h

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 941f12a333b63939f3a1257dffd6ee6dcc3e7d4b..2efdacc290e58962cb8917953e78cb7afd6ca17d 100644 (file)
--- 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 {