diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 00:06:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 00:06:13 -0400 |
| commit | 9f34217c846a96dea03f4418e2f27423658d3542 (patch) | |
| tree | 5b137af50db5758261700015911afb197ac8fc9f /drivers/target/Makefile | |
| parent | 95e14ed7fc4b2db62eb597a70850a0fede48b78a (diff) | |
| parent | 3703b2c5d041a68095cdd22380c23ce27d449ad7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (55 commits)
[SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
[SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion
[SCSI] Revert "[SCSI] Retrieve the Caching mode page"
[SCSI] bnx2fc: IO completion not processed due to missed wakeup
[SCSI] qla4xxx: Update driver version to 5.02.00-k6
[SCSI] qla4xxx: masking required bits of add_fw_options during initialization
[SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices
[SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param
[SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter
[SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed
[SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter
[SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
[SCSI] qla4xxx: cleanup DDB relogin logic during initialization
[SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
[SCSI] qla4xxx: Do not send mbox command if FW is in failed state
[SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
[SCSI] ses: add subenclosure support
[SCSI] bnx2fc: Bump version to 1.0.1
[SCSI] bnx2fc: Remove unnecessary module state checks
[SCSI] bnx2fc: Fix MTU issue by using static MTU
...
Diffstat (limited to 'drivers/target/Makefile')
| -rw-r--r-- | drivers/target/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/target/Makefile b/drivers/target/Makefile index 973bb190ef5..1178bbfc68f 100644 --- a/drivers/target/Makefile +++ b/drivers/target/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/ | ||
| 2 | 1 | ||
| 3 | target_core_mod-y := target_core_configfs.o \ | 2 | target_core_mod-y := target_core_configfs.o \ |
| 4 | target_core_device.o \ | 3 | target_core_device.o \ |
| @@ -13,7 +12,8 @@ target_core_mod-y := target_core_configfs.o \ | |||
| 13 | target_core_transport.o \ | 12 | target_core_transport.o \ |
| 14 | target_core_cdb.o \ | 13 | target_core_cdb.o \ |
| 15 | target_core_ua.o \ | 14 | target_core_ua.o \ |
| 16 | target_core_rd.o | 15 | target_core_rd.o \ |
| 16 | target_core_stat.o | ||
| 17 | 17 | ||
| 18 | obj-$(CONFIG_TARGET_CORE) += target_core_mod.o | 18 | obj-$(CONFIG_TARGET_CORE) += target_core_mod.o |
| 19 | 19 | ||
| @@ -21,3 +21,6 @@ obj-$(CONFIG_TARGET_CORE) += target_core_mod.o | |||
| 21 | obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o | 21 | obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o |
| 22 | obj-$(CONFIG_TCM_FILEIO) += target_core_file.o | 22 | obj-$(CONFIG_TCM_FILEIO) += target_core_file.o |
| 23 | obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o | 23 | obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o |
| 24 | |||
| 25 | # Fabric modules | ||
| 26 | obj-$(CONFIG_LOOPBACK_TARGET) += loopback/ | ||