---

yaml --- r: 280290 b: refs/heads/master c: 94ea415 h: refs/heads/master v: v3
git-mirror · Jan 4, 2012 · 5c12342 · 5c12342
1 parent 3e061fc
commit 5c12342
Show file tree

Hide file tree

Showing 5 changed files with 543 additions and 524 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9be96f3fd10187f185d84cf878cf032465bcced3
+refs/heads/master: 94ea4158f1733e3b10cef067d535f504866e0c41
diff --git a/trunk/block/Makefile b/trunk/block/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
 			blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
 			blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
 			blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o \
-			partitions/
+			partition-generic.o partitions/
 
 obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o
 obj-$(CONFIG_BLK_DEV_BSGLIB)	+= bsg-lib.o