summaryrefslogtreecommitdiffstats
path: root/drivers/block/Makefile
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-06-09 20:13:37 +0200
committerDan Williams <dan.j.williams@intel.com>2015-06-25 03:24:10 +0200
commit18da2c9ee41a036bf470dbad73c18a815725d36e (patch)
treec69bb8f44dcb1df4c7579184c3051e5b51729d87 /drivers/block/Makefile
parentlibnvdimm: support for legacy (non-aliasing) nvdimms (diff)
downloadlinux-18da2c9ee41a036bf470dbad73c18a815725d36e.tar.xz
linux-18da2c9ee41a036bf470dbad73c18a815725d36e.zip
libnvdimm, pmem: move pmem to drivers/nvdimm/
Prepare the pmem driver to consume PMEM namespaces emitted by regions of an nvdimm_bus instance. No functional change. Acked-by: Christoph Hellwig <hch@lst.de> Tested-by: Toshi Kani <toshi.kani@hp.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/block/Makefile')
-rw-r--r--drivers/block/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 9cc6c18a1c7e..02b688d1438d 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_PS3_VRAM) += ps3vram.o
obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o
obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o
obj-$(CONFIG_BLK_DEV_RAM) += brd.o
-obj-$(CONFIG_BLK_DEV_PMEM) += pmem.o
obj-$(CONFIG_BLK_DEV_LOOP) += loop.o
obj-$(CONFIG_BLK_CPQ_DA) += cpqarray.o
obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o