summaryrefslogtreecommitdiffstats
path: root/drivers/block/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-14 06:29:07 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-14 06:29:07 +0900
commitf499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch)
tree1af6235c18391212c40116eb90b01eae8938efee /drivers/block/Makefile
parentfc3f55e672e1ed917dd9e215af81939cd3d717da (diff)
parent80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block/Makefile')
-rw-r--r--drivers/block/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 3145141cef7..7755a5e2a85 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o
obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o
obj-$(CONFIG_XILINX_SYSACE) += xsysace.o
obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o
+obj-$(CONFIG_MG_DISK) += mg_disk.o
obj-$(CONFIG_SUNVDC) += sunvdc.o
obj-$(CONFIG_BLK_DEV_UMEM) += umem.o