diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 15:16:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 15:16:07 -0500 |
| commit | 12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3 (patch) | |
| tree | 158610ef6c7711afb60d78956ab4b131bf6a08ef /drivers/scsi/Makefile | |
| parent | 61b7efddc5256225099d13185659e9ad9d8abc8a (diff) | |
| parent | fc091e03820bf67e543362bd40959701a71d0c27 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 6e0c059df6a5..320e765fa0cd 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
| @@ -80,7 +80,7 @@ obj-$(CONFIG_SCSI_QLOGIC_FAS) += qlogicfas408.o qlogicfas.o | |||
| 80 | obj-$(CONFIG_PCMCIA_QLOGIC) += qlogicfas408.o | 80 | obj-$(CONFIG_PCMCIA_QLOGIC) += qlogicfas408.o |
| 81 | obj-$(CONFIG_SCSI_QLOGIC_FC) += qlogicfc.o | 81 | obj-$(CONFIG_SCSI_QLOGIC_FC) += qlogicfc.o |
| 82 | obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o | 82 | obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o |
| 83 | obj-$(CONFIG_SCSI_QLA2XXX) += qla2xxx/ | 83 | obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx/ |
| 84 | obj-$(CONFIG_SCSI_LPFC) += lpfc/ | 84 | obj-$(CONFIG_SCSI_LPFC) += lpfc/ |
| 85 | obj-$(CONFIG_SCSI_PAS16) += pas16.o | 85 | obj-$(CONFIG_SCSI_PAS16) += pas16.o |
| 86 | obj-$(CONFIG_SCSI_SEAGATE) += seagate.o | 86 | obj-$(CONFIG_SCSI_SEAGATE) += seagate.o |