---

yaml --- r: 324070 b: refs/heads/master c: f30664e h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · 653f6a2 · 653f6a2
1 parent 519ca67
commit 653f6a2
Show file tree

Hide file tree

Showing 6 changed files with 598 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e73c2cf78f797f3ff299ca39b210bceb40ab804
+refs/heads/master: f30664e2c85c7804f07c636bbe99f35e0b2d4c76
diff --git a/trunk/drivers/s390/block/Kconfig b/trunk/drivers/s390/block/Kconfig
@@ -70,3 +70,14 @@ config DASD_EER
 	  This driver provides a character device interface to the
 	  DASD extended error reporting. This is only needed if you want to
 	  use applications written for the EER facility.
+
+config SCM_BLOCK
+	def_tristate m
+	prompt "Support for Storage Class Memory"
+	depends on S390 && BLOCK && EADM_SCH && SCM_BUS
+	help
+	  Block device driver for Storage Class Memory (SCM). This driver
+	  provides a block device interface for each available SCM increment.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called scm_block.
diff --git a/trunk/drivers/s390/block/Makefile b/trunk/drivers/s390/block/Makefile
@@ -17,3 +17,6 @@ obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
 obj-$(CONFIG_DASD_FBA)  += dasd_fba_mod.o
 obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
 obj-$(CONFIG_DCSSBLK) += dcssblk.o
+
+scm_block-objs := scm_drv.o scm_blk.o
+obj-$(CONFIG_SCM_BLOCK) += scm_block.o