Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 9cc6c18a1c7e2af444620b2d3257b100e9bc6f0f..02b688d1438d95b6ad4f64cac713dacf77023c40 100644 (file)
--- 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