diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /drivers/scsi/Makefile | |
| parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
| parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index e513c3158ad9..81803a16f986 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
| @@ -78,7 +78,6 @@ obj-$(CONFIG_SCSI_NCR_Q720) += NCR_Q720_mod.o | |||
| 78 | obj-$(CONFIG_SCSI_SYM53C416) += sym53c416.o | 78 | obj-$(CONFIG_SCSI_SYM53C416) += sym53c416.o |
| 79 | obj-$(CONFIG_SCSI_QLOGIC_FAS) += qlogicfas408.o qlogicfas.o | 79 | 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 | ||
| 82 | obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o | 81 | obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o |
| 83 | obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx/ | 82 | obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx/ |
| 84 | obj-$(CONFIG_SCSI_LPFC) += lpfc/ | 83 | obj-$(CONFIG_SCSI_LPFC) += lpfc/ |