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/scsi | |
| 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/scsi')
| -rw-r--r-- | drivers/scsi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 84d546323dc7..ebd0cf00bf3e 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
| @@ -34,6 +34,7 @@ obj-$(CONFIG_SCSI_ISCSI_ATTRS) += scsi_transport_iscsi.o | |||
| 34 | obj-$(CONFIG_SCSI_SAS_ATTRS) += scsi_transport_sas.o | 34 | obj-$(CONFIG_SCSI_SAS_ATTRS) += scsi_transport_sas.o |
| 35 | 35 | ||
| 36 | obj-$(CONFIG_ISCSI_TCP) += libiscsi.o iscsi_tcp.o | 36 | obj-$(CONFIG_ISCSI_TCP) += libiscsi.o iscsi_tcp.o |
| 37 | obj-$(CONFIG_INFINIBAND_ISER) += libiscsi.o | ||
| 37 | obj-$(CONFIG_SCSI_AMIGA7XX) += amiga7xx.o 53c7xx.o | 38 | obj-$(CONFIG_SCSI_AMIGA7XX) += amiga7xx.o 53c7xx.o |
| 38 | obj-$(CONFIG_A3000_SCSI) += a3000.o wd33c93.o | 39 | obj-$(CONFIG_A3000_SCSI) += a3000.o wd33c93.o |
| 39 | obj-$(CONFIG_A2091_SCSI) += a2091.o wd33c93.o | 40 | obj-$(CONFIG_A2091_SCSI) += a2091.o wd33c93.o |