diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 19:07:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 19:07:58 -0400 |
| commit | 61b9175808670d9abf52156803ae0ed1e3706ac4 (patch) | |
| tree | feeaf7190aff1daa6ae365fd7c1107ea2d60fb9f /drivers/infiniband/Kconfig | |
| parent | f36f44de721db44b4c2944133c3c5c2e06f633f0 (diff) | |
| parent | 3f1244a2f8d3892f991b662cea49b2a0b4e0c115 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/iser: iSER Kconfig and Makefile
IB/iser: iSER handling of memory for RDMA
IB/iser: iSER RDMA CM (CMA) and IB verbs interaction
IB/iser: iSER initiator iSCSI PDU and TX/RX
IB/iser: iSCSI iSER transport provider high level code
IB/iser: iSCSI iSER transport provider header file
IB/uverbs: Remove unnecessary list_del()s
IB/uverbs: Don't free wr list when it's known to be empty
Diffstat (limited to 'drivers/infiniband/Kconfig')
| -rw-r--r-- | drivers/infiniband/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index ba2d6505e9a4..69a53d476b5b 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig | |||
| @@ -41,4 +41,6 @@ source "drivers/infiniband/ulp/ipoib/Kconfig" | |||
| 41 | 41 | ||
| 42 | source "drivers/infiniband/ulp/srp/Kconfig" | 42 | source "drivers/infiniband/ulp/srp/Kconfig" |
| 43 | 43 | ||
| 44 | source "drivers/infiniband/ulp/iser/Kconfig" | ||
| 45 | |||
| 44 | endmenu | 46 | endmenu |