diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/mlx4/device.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/mlx4/device.h')
| -rw-r--r-- | include/linux/mlx4/device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 3aff8a6a389e..ce7cc6c7bcbb 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
| @@ -210,6 +210,7 @@ struct mlx4_caps { | |||
| 210 | int num_comp_vectors; | 210 | int num_comp_vectors; |
| 211 | int num_mpts; | 211 | int num_mpts; |
| 212 | int num_mtt_segs; | 212 | int num_mtt_segs; |
| 213 | int mtts_per_seg; | ||
| 213 | int fmr_reserved_mtts; | 214 | int fmr_reserved_mtts; |
| 214 | int reserved_mtts; | 215 | int reserved_mtts; |
| 215 | int reserved_mrws; | 216 | int reserved_mrws; |