upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / scsi / Makefile

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 47ee56e..07e4225 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -131,7 +131,7 @@ obj-$(CONFIG_SCSI_SATA_VITESSE)     += libata.o sata_vsc.o
 obj-$(CONFIG_SCSI_SATA_SIS)    += libata.o sata_sis.o
 obj-$(CONFIG_SCSI_SATA_SX4)    += libata.o sata_sx4.o
 obj-$(CONFIG_SCSI_SATA_NV)     += libata.o sata_nv.o
-obj-$(CONFIG_SCSI_LPFC)                += lpfc/
+obj-$(CONFIG_SCSI_SATA_ULI)    += libata.o sata_uli.o
 
 obj-$(CONFIG_ARM)              += arm/
 
@@ -150,8 +150,6 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS)     += scsi_proc.o
 
 sd_mod-objs    := sd.o
 sr_mod-objs    := sr.o sr_ioctl.o sr_vendor.o
-initio-objs    := ini9100u.o i91uscsi.o
-a100u2w-objs   := inia100.o i60uscsi.o
 ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
                := -DCONFIG_NCR53C8XX_PREFETCH -DSCSI_NCR_BIG_ENDIAN \
                        -DCONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS