Merge branch android-common-3.10

[firefly-linux-kernel-4.4.55.git] / block / partitions / check.c

diff --git a/block/partitions/check.c b/block/partitions/check.c
index a7c678fff0b762d0102d411b34785c89f94b7eb7..b7c76e4da75f932ccbed59fe04a102774bf54a00 100755 (executable)
--- a/block/partitions/check.c
+++ b/block/partitions/check.c
@@ -34,6 +34,7 @@
 #include "karma.h"
 #include "sysv68.h"
 #include "rk.h"
+#include "cmdline.h"
 
 int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/
 
@@ -65,6 +66,9 @@ static int (*check_part[])(struct parsed_partitions *) = {
        adfspart_check_ADFS,
 #endif
 
+#ifdef CONFIG_CMDLINE_PARTITION
+       cmdline_partition,
+#endif
 #ifdef CONFIG_EFI_PARTITION
        efi_partition,          /* this must come before msdos */
 #endif