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

Commit e67f86b3 authored Oct 15, 2013 by Akhil Bhansali Committed by Jens Axboe Nov 08, 2013

Add support for sTec's pci-e flash card Kronos



Signed-off-by: Akhil Bhansali <abhansali@stec-inc.com>
Signed-off-by: Ramprasad Chinthekindi <rchinthekindi@stec-inc.com>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>

Folded patch, contributions to clean up this driver from:

Jens Axboe
Dan Carpenter
Andrew Morton

Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 0317cd6d

drivers/block/Kconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -316,6 +316,16 @@ config BLK_DEV_NVME
		To compile this driver as a module, choose M here: the
		module will be called nvme.

		config BLK_DEV_SKD
		tristate "STEC S1120 Block Driver"
		depends on PCI
		depends on 64BIT
		---help---
		Saying Y or M here will enable support for the
		STEC, Inc. S1120 PCIe SSD.

		Use device /dev/skd$N amd /dev/skd$Np$M.

		config BLK_DEV_OSD
		tristate "OSD object-as-blkdev support"
		depends on SCSI_OSD_ULD

drivers/block/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o
		obj-$(CONFIG_MG_DISK) += mg_disk.o
		obj-$(CONFIG_SUNVDC) += sunvdc.o
		obj-$(CONFIG_BLK_DEV_NVME) += nvme.o
		obj-$(CONFIG_BLK_DEV_SKD) += skd.o
		obj-$(CONFIG_BLK_DEV_OSD) += osdblk.o

		obj-$(CONFIG_BLK_DEV_UMEM) += umem.o
		@@ -43,4 +44,5 @@ obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/
		obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/

		nvme-y := nvme-core.o nvme-scsi.o
		skd-y := skd_main.o
		swim_mod-y := swim.o swim_asm.o