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

[karo-tx-linux.git] / arch / sh / boards / mach-migor / setup.c

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 34cd0c5ff2e1bd104e6de9ff407ff478d2bb1aa7..a8a1ca741c8599b975420dd1a796a573a33e40bc 100644 (file)
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -188,7 +188,6 @@ static struct platform_nand_data migor_nand_flash_data = {
                .partitions = migor_nand_flash_partitions,
                .nr_partitions = ARRAY_SIZE(migor_nand_flash_partitions),
                .chip_delay = 20,
-               .part_probe_types = (const char *[]) { "cmdlinepart", NULL },
        },
        .ctrl = {
                .dev_ready = migor_nand_flash_ready,