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

[uclinux-h8/linux.git] / arch / arm / mach-pxa / em-x270.c

diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index a3a4a38..97f82ad 100644 (file)
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -338,8 +338,6 @@ static struct mtd_partition em_x270_partition_info[] = {
        },
 };
 
-static const char *em_x270_part_probes[] = { "cmdlinepart", NULL };
-
 struct platform_nand_data em_x270_nand_platdata = {
        .chip = {
                .nr_chips = 1,
@@ -347,7 +345,6 @@ struct platform_nand_data em_x270_nand_platdata = {
                .nr_partitions = ARRAY_SIZE(em_x270_partition_info),
                .partitions = em_x270_partition_info,
                .chip_delay = 20,
-               .part_probe_types = em_x270_part_probes,
        },
        .ctrl = {
                .hwcontrol = 0,