rk: temp revert rk change

[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..19ba207ea7d12de48ae0a6182c71df3d188c2b3a 100644 (file)
--- a/block/partitions/check.c
+++ b/block/partitions/check.c
@@ -19,6 +19,7 @@
 #include <linux/genhd.h>
 
 #include "check.h"
+
 #include "acorn.h"
 #include "amiga.h"
 #include "atari.h"
@@ -33,7 +34,6 @@
 #include "efi.h"
 #include "karma.h"
 #include "sysv68.h"
-#include "rk.h"
 
 int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/
 
@@ -104,10 +104,6 @@ static int (*check_part[])(struct parsed_partitions *) = {
 #ifdef CONFIG_SYSV68_PARTITION
        sysv68_partition,
 #endif
-#ifdef CONFIG_RK_PARTITION
-       rkpart_partition,
-#endif
-
        NULL
 };
 
@@ -161,13 +157,6 @@ check_partition(struct gendisk *hd, struct block_device *bdev)
                sprintf(state->name, "p");
 
        i = res = err = 0;
-
-       /* Rockchip partition table ONLY used by eMMC disk */
-       #ifdef CONFIG_RK_PARTITION
-       if ((179 == MAJOR(bdev->bd_dev) && (1 == hd->emmc_disk)))
-               i = sizeof(check_part) / sizeof(struct parsed_partitions *) - 2;
-       #endif
-
        while (!res && check_part[i]) {
                memset(state->parts, 0, state->limit * sizeof(state->parts[0]));
                res = check_part[i++](state);