Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d3467f0 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'sil24'

parents e710245b 042c21fd

drivers/scsi/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -521,6 +521,14 @@ config SCSI_SATA_SIL 




	  If unsure, say N.

	  If unsure, say N.





config SCSI_SATA_SIL24

	tristate "Silicon Image 3124/3132 SATA support"

	depends on SCSI_SATA && PCI && EXPERIMENTAL

	help

	  This option enables support for Silicon Image 3124/3132 Serial ATA.



	  If unsure, say N.



config SCSI_SATA_SIS

config SCSI_SATA_SIS

	tristate "SiS 964/180 SATA support"

	tristate "SiS 964/180 SATA support"

	depends on SCSI_SATA && PCI && EXPERIMENTAL

	depends on SCSI_SATA && PCI && EXPERIMENTAL

drivers/scsi/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,7 @@ obj-$(CONFIG_SCSI_ATA_PIIX) += libata.o ata_piix.o 
obj-$(CONFIG_SCSI_SATA_PROMISE)	+= libata.o sata_promise.o

obj-$(CONFIG_SCSI_SATA_PROMISE)	+= libata.o sata_promise.o

obj-$(CONFIG_SCSI_SATA_QSTOR)	+= libata.o sata_qstor.o

obj-$(CONFIG_SCSI_SATA_QSTOR)	+= libata.o sata_qstor.o

obj-$(CONFIG_SCSI_SATA_SIL)	+= libata.o sata_sil.o

obj-$(CONFIG_SCSI_SATA_SIL)	+= libata.o sata_sil.o

obj-$(CONFIG_SCSI_SATA_SIL24)	+= libata.o sata_sil24.o

obj-$(CONFIG_SCSI_SATA_VIA)	+= libata.o sata_via.o

obj-$(CONFIG_SCSI_SATA_VIA)	+= libata.o sata_via.o

obj-$(CONFIG_SCSI_SATA_VITESSE)	+= libata.o sata_vsc.o

obj-$(CONFIG_SCSI_SATA_VITESSE)	+= libata.o sata_vsc.o

obj-$(CONFIG_SCSI_SATA_SIS)	+= libata.o sata_sis.o

obj-$(CONFIG_SCSI_SATA_SIS)	+= libata.o sata_sis.o

drivers/scsi/sata_sil24.c

0 → 100644
+875 −0

File added.

Preview size limit exceeded, changes collapsed.