diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 15:32:42 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 15:32:42 -0400 |
| commit | 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe (patch) | |
| tree | 68096d5b17e884d270420d50e466186c73019830 /drivers/scsi/bnx2i/bnx2i.h | |
| parent | 40c9f61eae9098212b6906f29f30f08f7a19b5e2 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge branch 'v3.6-rc7' into tty-next
This is to sync up on Linus's branch to get the other tty and core changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/bnx2i/bnx2i.h')
| -rw-r--r-- | drivers/scsi/bnx2i/bnx2i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h index 0c53c28dc3d3..7e77cf620291 100644 --- a/drivers/scsi/bnx2i/bnx2i.h +++ b/drivers/scsi/bnx2i/bnx2i.h | |||
| @@ -350,6 +350,7 @@ struct bnx2i_hba { | |||
| 350 | struct pci_dev *pcidev; | 350 | struct pci_dev *pcidev; |
| 351 | struct net_device *netdev; | 351 | struct net_device *netdev; |
| 352 | void __iomem *regview; | 352 | void __iomem *regview; |
| 353 | resource_size_t reg_base; | ||
| 353 | 354 | ||
| 354 | u32 age; | 355 | u32 age; |
| 355 | unsigned long cnic_dev_type; | 356 | unsigned long cnic_dev_type; |