diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:17 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:17 +0200 |
commit | 5d7e606a3696b992df40afaf9b04872320346c41 (patch) | |
tree | 92b060685f1187ae895eb8dc7256445ed455bfa5 /block/partitions/Makefile | |
parent | 546c9b21117077f145d59a0168fcb6fd0a3c3b24 (diff) | |
parent | 285f0b3fe3a59c56db9ae68e6a1ae0e2a67b72f9 (diff) |
Merge topic branch 'storage-mmc' into integration-linux-ux500-3.3
Diffstat (limited to 'block/partitions/Makefile')
-rw-r--r-- | block/partitions/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/partitions/Makefile b/block/partitions/Makefile index 03af8eac51d..48b216c53db 100644 --- a/block/partitions/Makefile +++ b/block/partitions/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_BLOCK) := check.o obj-$(CONFIG_ACORN_PARTITION) += acorn.o obj-$(CONFIG_AMIGA_PARTITION) += amiga.o obj-$(CONFIG_ATARI_PARTITION) += atari.o +obj-$(CONFIG_BLKDEV_PARTITION) += blkdev_parts.o obj-$(CONFIG_MAC_PARTITION) += mac.o obj-$(CONFIG_LDM_PARTITION) += ldm.o obj-$(CONFIG_MSDOS_PARTITION) += msdos.o |