diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /drivers/infiniband/hw/cxgb3/iwch.h | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'drivers/infiniband/hw/cxgb3/iwch.h')
| -rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch.h b/drivers/infiniband/hw/cxgb3/iwch.h index d2409a505e8d..3773453b2cf0 100644 --- a/drivers/infiniband/hw/cxgb3/iwch.h +++ b/drivers/infiniband/hw/cxgb3/iwch.h | |||
| @@ -48,8 +48,6 @@ struct iwch_qp; | |||
| 48 | struct iwch_mr; | 48 | struct iwch_mr; |
| 49 | 49 | ||
| 50 | struct iwch_rnic_attributes { | 50 | struct iwch_rnic_attributes { |
| 51 | u32 vendor_id; | ||
| 52 | u32 vendor_part_id; | ||
| 53 | u32 max_qps; | 51 | u32 max_qps; |
| 54 | u32 max_wrs; /* Max for any SQ/RQ */ | 52 | u32 max_wrs; /* Max for any SQ/RQ */ |
| 55 | u32 max_sge_per_wr; | 53 | u32 max_sge_per_wr; |