diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
| commit | c4e00fac42f268ed0a547cdd1d12bb8399864040 (patch) | |
| tree | 1a54d87be2066c49b71a03764fcb4fc7f9c68c41 /drivers/message/fusion/Makefile | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| parent | d6b0c53723753fc0cfda63f56735b225c43e1e9a (diff) | |
Merge ../scsi-misc-2.6
Conflicts:
drivers/scsi/nsp32.c
drivers/scsi/pcmcia/nsp_cs.c
Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/Makefile')
| -rw-r--r-- | drivers/message/fusion/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile index 51740b346224..b114236f4395 100644 --- a/drivers/message/fusion/Makefile +++ b/drivers/message/fusion/Makefile | |||
| @@ -33,6 +33,11 @@ | |||
| 33 | # For mptfc: | 33 | # For mptfc: |
| 34 | #CFLAGS_mptfc.o += -DMPT_DEBUG_FC | 34 | #CFLAGS_mptfc.o += -DMPT_DEBUG_FC |
| 35 | 35 | ||
| 36 | # For mptsas: | ||
| 37 | #CFLAGS_mptsas.o += -DMPT_DEBUG_SAS | ||
| 38 | #CFLAGS_mptsas.o += -DMPT_DEBUG_SAS_WIDE | ||
| 39 | |||
| 40 | |||
| 36 | #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC | 41 | #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC |
| 37 | 42 | ||
| 38 | obj-$(CONFIG_FUSION_SPI) += mptbase.o mptscsih.o mptspi.o | 43 | obj-$(CONFIG_FUSION_SPI) += mptbase.o mptscsih.o mptspi.o |