Merge tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / arch / sh / boards / mach-rsk / setup.c

diff --git a/arch/sh/boards/mach-rsk/setup.c b/arch/sh/boards/mach-rsk/setup.c
index 2685ea03b0642bf7a653b52e09b5966d037df49f..6bc134bd7ec265555bdd6442775c285c38f2d5ab 100644 (file)
--- a/arch/sh/boards/mach-rsk/setup.c
+++ b/arch/sh/boards/mach-rsk/setup.c
@@ -27,8 +27,6 @@ static struct regulator_consumer_supply dummy_supplies[] = {
        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
 };
 
-static const char *part_probes[] = { "cmdlinepart", NULL };
-
 static struct mtd_partition rsk_partitions[] = {
        {
                .name           = "Bootloader",
@@ -50,7 +48,6 @@ static struct physmap_flash_data flash_data = {
        .parts                  = rsk_partitions,
        .nr_parts               = ARRAY_SIZE(rsk_partitions),
        .width                  = 2,
-       .part_probe_types       = part_probes,
 };
 
 static struct resource flash_resource = {