diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 15:27:22 -0500 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /drivers/net/benet/be.h | |
| parent | 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (diff) | |
| parent | 4b8fe66300acb2fba8b16d62606e0d30204022fc (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
Diffstat (limited to 'drivers/net/benet/be.h')
| -rw-r--r-- | drivers/net/benet/be.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 9cab32328bba..add0b93350dd 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h | |||
| @@ -242,7 +242,7 @@ struct be_adapter { | |||
| 242 | u8 __iomem *db; /* Door Bell */ | 242 | u8 __iomem *db; /* Door Bell */ |
| 243 | u8 __iomem *pcicfg; /* PCI config space */ | 243 | u8 __iomem *pcicfg; /* PCI config space */ |
| 244 | 244 | ||
| 245 | spinlock_t mbox_lock; /* For serializing mbox cmds to BE card */ | 245 | struct mutex mbox_lock; /* For serializing mbox cmds to BE card */ |
| 246 | struct be_dma_mem mbox_mem; | 246 | struct be_dma_mem mbox_mem; |
| 247 | /* Mbox mem is adjusted to align to 16 bytes. The allocated addr | 247 | /* Mbox mem is adjusted to align to 16 bytes. The allocated addr |
| 248 | * is stored for freeing purpose */ | 248 | * is stored for freeing purpose */ |