diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-20 17:36:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-20 17:36:23 -0400 |
| commit | a85ae0e97879f51bccd8511668b07d346d98b3eb (patch) | |
| tree | 56c547038a9a6eaec0068e9e2798b07f56dc3603 /drivers/net/ethernet/broadcom/genet/bcmgenet.h | |
| parent | 3907c432cb7e1f1e9143e8ac97e4b9a4c3f153bc (diff) | |
| parent | b2cde2cc71f2382e4a4bfaaacd5263bd93f1e0d2 (diff) | |
Merge branch 'bcmgenet-next'
Florian Fainelli says:
====================
net: bcmgenet: misc fixes
This patch series contains some misc. fixes for the bcmgenet driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmgenet.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index a6758adefaab..0f117105fed1 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -523,7 +523,6 @@ struct bcmgenet_priv { void __iomem *base; enum bcmgenet_version version; struct net_device *dev; - spinlock_t lock; u32 int0_mask; u32 int1_mask; |