# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/09/13 12:49:36+09:00 tj@xxxxxxxxxxxxxxxx # removed unused velocity_info.xmit_lock # # drivers/net/via-velocity.h # 2004/09/13 12:49:25+09:00 tj@xxxxxxxxxxxxxxxx +0 -1 # removed unused velocity_info.xmit_lock # # drivers/net/via-velocity.c # 2004/09/13 12:49:25+09:00 tj@xxxxxxxxxxxxxxxx +0 -3 # removed unused velocity_info.xmit_lock # diff -Nru a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c --- a/drivers/net/via-velocity.c 2004-09-13 13:48:34 +09:00 +++ b/drivers/net/via-velocity.c 2004-09-13 13:48:34 +09:00 @@ -872,10 +872,7 @@ vptr->io_size = info->io_size; vptr->num_txq = info->txqueue; vptr->multicast_limit = MCAM_SIZE; - spin_lock_init(&vptr->lock); - spin_lock_init(&vptr->xmit_lock); - INIT_LIST_HEAD(&vptr->list); } diff -Nru a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h --- a/drivers/net/via-velocity.h 2004-09-13 13:48:34 +09:00 +++ b/drivers/net/via-velocity.h 2004-09-13 13:48:34 +09:00 @@ -1792,7 +1792,6 @@ u8 mCAMmask[(MCAM_SIZE / 8)]; spinlock_t lock; - spinlock_t xmit_lock; int wol_opts; u8 wol_passwd[6];