diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 16:47:45 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 16:47:45 -0400 |
| commit | 84d891d6727c17832c79ec96d3d107a87d857978 (patch) | |
| tree | a189a4d00c1387e409e2f9808c72c8088728c33b /drivers/scsi/Makefile | |
| parent | 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 (diff) | |
| parent | 7676f83aeb774e7a3abe6af06ec92b29488b5b79 (diff) | |
Merge ../scsi-rc-fixes-2.6
Conflicts:
include/scsi/scsi_devinfo.h
Same number for two BLIST flags: BLIST_MAX_512 and BLIST_ATTACH_PQ3
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
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 efdff61c5808..3ce80ab4824a 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/ |