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

Commit 9600c11b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

parents 676d55ae 13e1e1f0

drivers/message/fusion/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -35,6 +35,23 @@ config FUSION_FC 
	  LSIFC929X

	  LSIFC929XL



config FUSION_SAS

	tristate "Fusion MPT ScsiHost drivers for SAS"

	depends on PCI && SCSI

 	select FUSION

	select SCSI_SAS_ATTRS

	---help---

	  SCSI HOST support for a SAS host adapters.



	  List of supported controllers:



	  LSISAS1064

	  LSISAS1066

	  LSISAS1068

	  LSISAS1064E

	  LSISAS1066E

	  LSISAS1068E



config FUSION_MAX_SGE

	int "Maximum number of scatter gather entries (16 - 128)"

	depends on FUSION

drivers/message/fusion/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,5 +34,6 @@ 


obj-$(CONFIG_FUSION_SPI)	+= mptbase.o mptscsih.o mptspi.o

obj-$(CONFIG_FUSION_FC)		+= mptbase.o mptscsih.o mptfc.o

obj-$(CONFIG_FUSION_SAS)	+= mptbase.o mptscsih.o mptsas.o

obj-$(CONFIG_FUSION_CTL)	+= mptctl.o

obj-$(CONFIG_FUSION_LAN)	+= mptlan.o