From 4a9dde778c537ea0db67a62ee2367e6d54e5fe2c Mon Sep 17 00:00:00 2001
From: Jonas Bonn <jonas@southpole.se>
Date: Thu, 25 Nov 2010 02:30:26 +0000
Subject: [PATCH] --- yaml --- r: 224516 b: refs/heads/master c:
 eac0d3ff5a92de410964fdf0d072314821ca39fc h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/ethoc.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b3d048d85763..6032f82564b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0f4258be2515afce8ef1e6fb22312525c281798
+refs/heads/master: eac0d3ff5a92de410964fdf0d072314821ca39fc
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
index 9ea3c54e1a38..e9e712e0f92c 100644
--- a/trunk/drivers/net/ethoc.c
+++ b/trunk/drivers/net/ethoc.c
@@ -185,7 +185,6 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");
  * @netdev:	pointer to network device structure
  * @napi:	NAPI structure
  * @msg_enable:	device state flags
- * @rx_lock:	receive lock
  * @lock:	device lock
  * @phy:	attached PHY
  * @mdio:	MDIO bus for PHY access
@@ -210,7 +209,6 @@ struct ethoc {
 	struct napi_struct napi;
 	u32 msg_enable;
 
-	spinlock_t rx_lock;
 	spinlock_t lock;
 
 	struct phy_device *phy;
@@ -1060,7 +1058,6 @@ static int __devinit ethoc_probe(struct platform_device *pdev)
 	/* setup NAPI */
 	netif_napi_add(netdev, &priv->napi, ethoc_poll, 64);
 
-	spin_lock_init(&priv->rx_lock);
 	spin_lock_init(&priv->lock);
 
 	ret = register_netdev(netdev);