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/check.c | |
parent | 546c9b21117077f145d59a0168fcb6fd0a3c3b24 (diff) | |
parent | 285f0b3fe3a59c56db9ae68e6a1ae0e2a67b72f9 (diff) |
Merge topic branch 'storage-mmc' into integration-linux-ux500-3.3
Diffstat (limited to 'block/partitions/check.c')
-rw-r--r-- | block/partitions/check.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/partitions/check.c b/block/partitions/check.c index bc908672c97..3020c577c3b 100644 --- a/block/partitions/check.c +++ b/block/partitions/check.c @@ -22,6 +22,7 @@ #include "acorn.h" #include "amiga.h" #include "atari.h" +#include "blkdev_parts.h" #include "ldm.h" #include "mac.h" #include "msdos.h" @@ -41,6 +42,9 @@ static int (*check_part[])(struct parsed_partitions *) = { * Probe partition formats with tables at disk address 0 * that also have an ADFS boot block at 0xdc0. */ +#ifdef CONFIG_BLKDEV_PARTITION + blkdev_partition, +#endif #ifdef CONFIG_ACORN_PARTITION_ICS adfspart_check_ICS, #endif |