diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 14:18:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 14:18:25 -0400 |
| commit | 28e4b224955cbe30275b2a7842e729023a4f4b03 (patch) | |
| tree | ab4d28fecc06070fc2a2742f4b4550b29de44912 /drivers/scsi/qla2xxx/Makefile | |
| parent | 22ae813b85df7c0b0fc7c8d6f336d6a9f566ff97 (diff) | |
| parent | 67d59dfdeb21df2c16dcd478b66177e91178ecd0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
[SCSI] 53c700: remove reliance on deprecated cmnd fields
[SCSI] hptiop: don't use cmnd->bufflen
[SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
[SCSI] aacraid: small misc. cleanups
[SCSI] aacraid: Update supported product information
[SCSI] aacraid: Fix return code interpretation
[SCSI] scsi_transport_sas: fix panic in sas_free_rphy
[SCSI] remove RQ_SCSI_* flags
[SCSI] remove scsi_request infrastructure
[SCSI] mptfusion: change driver revision to 3.03.10
[SCSI] mptfc: abort of board reset leaves port dead requiring reboot
[SCSI] mptfc: fix fibre channel infinite request/response loop
[SCSI] mptfc: set fibre channel fw target missing timers to one second
[SCSI] mptfusion: move fc event/reset handling to mptfc
[SCSI] spi transport: don't allow dt to be set on SE or HVD buses
[SCSI] aic7xxx: expose the bus setting to sysfs
[SCSI] scsi: remove Documentation/scsi/cpqfc.txt
[SCSI] drivers/scsi: Use ARRAY_SIZE macro
[SCSI] Remove last page_address from dc395x.c
[SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
...
Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)
Diffstat (limited to 'drivers/scsi/qla2xxx/Makefile')
| -rw-r--r-- | drivers/scsi/qla2xxx/Makefile | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile index c8f670ee60b4..411663af7bb7 100644 --- a/drivers/scsi/qla2xxx/Makefile +++ b/drivers/scsi/qla2xxx/Makefile | |||
| @@ -1,18 +1,4 @@ | |||
| 1 | EXTRA_CFLAGS += -DUNIQUE_FW_NAME | ||
| 2 | |||
| 3 | qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ | 1 | qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \ |
| 4 | qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o | 2 | qla_dbg.o qla_sup.o qla_attr.o |
| 5 | 3 | ||
| 6 | obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o | 4 | obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o |
| 7 | |||
| 8 | qla2100-y := ql2100.o ql2100_fw.o | ||
| 9 | qla2200-y := ql2200.o ql2200_fw.o | ||
| 10 | qla2300-y := ql2300.o ql2300_fw.o | ||
| 11 | qla2322-y := ql2322.o ql2322_fw.o | ||
| 12 | qla2400-y := ql2400.o ql2400_fw.o | ||
| 13 | |||
| 14 | obj-$(CONFIG_SCSI_QLA21XX) += qla2xxx.o qla2100.o | ||
| 15 | obj-$(CONFIG_SCSI_QLA22XX) += qla2xxx.o qla2200.o | ||
| 16 | obj-$(CONFIG_SCSI_QLA2300) += qla2xxx.o qla2300.o | ||
| 17 | obj-$(CONFIG_SCSI_QLA2322) += qla2xxx.o qla2322.o | ||
| 18 | obj-$(CONFIG_SCSI_QLA24XX) += qla2xxx.o qla2400.o | ||