diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-11 18:24:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-11 18:24:22 -0400 |
| commit | 4c4445013f792f82855079ac377bf5d75af4581c (patch) | |
| tree | fbdc80d7bd7cf3c40f85048b6f5e9c1357ca50d6 /drivers/scsi/pm8001/Makefile | |
| parent | ac4e01093f6d7b051c5d6a3e61ea5337774ac36a (diff) | |
| parent | 297b8a07347555f0d2fafa4a1ddfc332d2d4afa9 (diff) | |
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull second SCSI update from James "Jaj B" Bottomley:
"This is the final round of SCSI patches for the merge window. It
consists mostly of driver updates (bnx2fc, ibmfc, fnic, lpfc,
be2iscsi, pm80xx, qla4x and ipr).
There's also the power management updates that complete the patches in
Jens' tree, an iscsi refcounting problem fix from the last pull, some
dif handling in scsi_debug fixes, a few nice code cleanups and an
error handling busy bug fix."
* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (92 commits)
[SCSI] qla2xxx: Update firmware link in Kconfig file.
[SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used
[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
[SCSI] pm80xx: thermal, sas controller config and error handling update
[SCSI] pm80xx: NCQ error handling changes
[SCSI] pm80xx: WWN Modification for PM8081/88/89 controllers
[SCSI] pm80xx: Changed module name and debug messages update
[SCSI] pm80xx: Firmware flash memory free fix, with addition of new memory region for it
[SCSI] pm80xx: SPC new firmware changes for device id 0x8081 alone
[SCSI] pm80xx: Added SPCv/ve specific hardware functionalities and relevant changes in common files
[SCSI] pm80xx: MSI-X implementation for using 64 interrupts
[SCSI] pm80xx: Updated common functions common for SPC and SPCv/ve
[SCSI] pm80xx: Multiple inbound/outbound queue configuration
[SCSI] pm80xx: Added SPCv/ve specific ids, variables and modify for SPC
[SCSI] lpfc: fix up Kconfig dependencies
[SCSI] Handle MLQUEUE busy response in scsi_send_eh_cmnd
[SCSI] sd: change to auto suspend mode
[SCSI] sd: use REQ_PM in sd's runtime suspend operation
[SCSI] qla4xxx: Fix iocb_cnt calculation in qla4xxx_send_mbox_iocb()
[SCSI] ufs: Correct the expected data transfersize
...
Diffstat (limited to 'drivers/scsi/pm8001/Makefile')
| -rw-r--r-- | drivers/scsi/pm8001/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/pm8001/Makefile b/drivers/scsi/pm8001/Makefile index 52f04296171c..ce4cd87c7c66 100644 --- a/drivers/scsi/pm8001/Makefile +++ b/drivers/scsi/pm8001/Makefile | |||
| @@ -4,9 +4,10 @@ | |||
| 4 | # Copyright (C) 2008-2009 USI Co., Ltd. | 4 | # Copyright (C) 2008-2009 USI Co., Ltd. |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | obj-$(CONFIG_SCSI_PM8001) += pm8001.o | 7 | obj-$(CONFIG_SCSI_PM8001) += pm80xx.o |
| 8 | pm8001-y += pm8001_init.o \ | 8 | pm80xx-y += pm8001_init.o \ |
| 9 | pm8001_sas.o \ | 9 | pm8001_sas.o \ |
| 10 | pm8001_ctl.o \ | 10 | pm8001_ctl.o \ |
| 11 | pm8001_hwi.o | 11 | pm8001_hwi.o \ |
| 12 | pm80xx_hwi.o | ||
| 12 | 13 | ||