diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /drivers/infiniband/hw/cxgb4/t4.h | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/t4.h')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/t4.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h index aef55f42bea4..24f369046ef3 100644 --- a/drivers/infiniband/hw/cxgb4/t4.h +++ b/drivers/infiniband/hw/cxgb4/t4.h | |||
| @@ -36,8 +36,6 @@ | |||
| 36 | #include "t4_msg.h" | 36 | #include "t4_msg.h" |
| 37 | #include "t4fw_ri_api.h" | 37 | #include "t4fw_ri_api.h" |
| 38 | 38 | ||
| 39 | #define T4_QID_BASE 1024 | ||
| 40 | #define T4_MAX_QIDS 256 | ||
| 41 | #define T4_MAX_NUM_QP (1<<16) | 39 | #define T4_MAX_NUM_QP (1<<16) |
| 42 | #define T4_MAX_NUM_CQ (1<<15) | 40 | #define T4_MAX_NUM_CQ (1<<15) |
| 43 | #define T4_MAX_NUM_PD (1<<15) | 41 | #define T4_MAX_NUM_PD (1<<15) |