diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 11:45:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 11:45:17 -0700 |
| commit | a5b4860b973bb7a306562d8715ba8538a584537d (patch) | |
| tree | ddfdb65a1c857a1c1647dce3070ee930c23aea10 /drivers/infiniband/hw/ipath/ipath_verbs.h | |
| parent | e9ed7e722e3f4cea07cf3c4bfe98c18180a17793 (diff) | |
| parent | e2f81daf23efde23d8cac1fc253d41838f0347cf (diff) | |
| download | talos-op-linux-a5b4860b973bb7a306562d8715ba8538a584537d.tar.gz talos-op-linux-a5b4860b973bb7a306562d8715ba8538a584537d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Support small QP queues
IB/ehca: Make internal_create/destroy_qp() static
IB/ehca: Move ehca2ib_return_code() out of line
IB/ehca: Generate async event when SRQ limit reached
IB/ehca: Support large page MRs
IB/mlx4: Fix error path in create_qp_common()
mlx4_core: Change command token on timeout
IB/mthca: Change command token on timeout
IB/ipath: Remove ipath_layer dead code
IB/mlx4: Fix leaks in __mlx4_ib_modify_qp
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_verbs.h')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_verbs.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h index 9bbe81967f14..1a24c6a4a814 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.h +++ b/drivers/infiniband/hw/ipath/ipath_verbs.h @@ -42,8 +42,6 @@ #include <rdma/ib_pack.h> #include <rdma/ib_user_verbs.h> -#include "ipath_layer.h" - #define IPATH_MAX_RDMA_ATOMIC 4 #define QPN_MAX (1 << 24) |
