Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 7691505a2e12ee8621d93a5c0b78f3a4b8e6dcc1..5e584306be9992aae29c39a0c7221bdc82f053c8 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -11,9 +11,8 @@ obj-$(CONFIG_AMIGA_FLOPPY)    += amiflop.o
 obj-$(CONFIG_PS3_DISK)         += ps3disk.o
 obj-$(CONFIG_ATARI_FLOPPY)     += ataflop.o
 obj-$(CONFIG_AMIGA_Z2RAM)      += z2ram.o
-obj-$(CONFIG_BLK_DEV_RAM)      += rd.o
+obj-$(CONFIG_BLK_DEV_RAM)      += brd.o
 obj-$(CONFIG_BLK_DEV_LOOP)     += loop.o
-obj-$(CONFIG_BLK_DEV_PS2)      += ps2esdi.o
 obj-$(CONFIG_BLK_DEV_XD)       += xd.o
 obj-$(CONFIG_BLK_CPQ_DA)       += cpqarray.o
 obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o