Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / net / skge.h

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 2efdacc..1f1ce88 100644 (file)
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2418,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;