diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
| commit | b757f17e9184b65428c48a281d82f9acb3e96f0e (patch) | |
| tree | 7dc22c9f82f78c20caeff00fdd68a2e92e40504a /drivers/net/ethernet/emulex/benet/be.h | |
| parent | 3c76a8a95daeecd881718f88324041f6a5faab86 (diff) | |
| parent | da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 (diff) | |
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.
mvebu soc changes for v3.10
- use the mvebu-mbus driver
- prep for LPAE support
Depends:
- mvebu/cleanup (tags/cleanup_for_v3.10)
- mvebu/drivers (tags/drivers_for_v3.10)
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be.h')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 28ceb8414185..29aff55f2eea 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h | |||
| @@ -349,6 +349,7 @@ struct be_adapter { | |||
| 349 | struct pci_dev *pdev; | 349 | struct pci_dev *pdev; |
| 350 | struct net_device *netdev; | 350 | struct net_device *netdev; |
| 351 | 351 | ||
| 352 | u8 __iomem *csr; /* CSR BAR used only for BE2/3 */ | ||
| 352 | u8 __iomem *db; /* Door Bell */ | 353 | u8 __iomem *db; /* Door Bell */ |
| 353 | 354 | ||
| 354 | struct mutex mbox_lock; /* For serializing mbox cmds to BE card */ | 355 | struct mutex mbox_lock; /* For serializing mbox cmds to BE card */ |