diff options
| author | Ingo Molnar | 2009-04-29 14:46:59 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-04-29 14:47:05 +0200 |
| commit | e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch) | |
| tree | 4ba588631dd8189a818a91c9e3976526071178b6 /drivers/infiniband/hw/nes/nes_verbs.h | |
| parent | perf_counter tools: fix Documentation/perf_counter build error (diff) | |
| parent | Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a.tar.gz kernel-qcow2-linux-e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a.tar.xz kernel-qcow2-linux-e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_verbs.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h index 5e48f67fbe8d..41c07f29f7c9 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.h +++ b/drivers/infiniband/hw/nes/nes_verbs.h @@ -112,6 +112,7 @@ struct nes_cq { spinlock_t lock; u8 virtual_cq; u8 pad[3]; + u32 mcrqf; }; struct nes_wq { |