diff options
-rw-r--r-- | drivers/mtd/nand/at91_nand.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mtd/nand/at91_nand.c b/drivers/mtd/nand/at91_nand.c index 14b80cc90a7b..512e999177f7 100644 --- a/drivers/mtd/nand/at91_nand.c +++ b/drivers/mtd/nand/at91_nand.c | |||
@@ -82,6 +82,10 @@ static void at91_nand_disable(struct at91_nand_host *host) | |||
82 | at91_set_gpio_value(host->board->enable_pin, 1); | 82 | at91_set_gpio_value(host->board->enable_pin, 1); |
83 | } | 83 | } |
84 | 84 | ||
85 | #ifdef CONFIG_MTD_PARTITIONS | ||
86 | const char *part_probes[] = { "cmdlinepart", NULL }; | ||
87 | #endif | ||
88 | |||
85 | /* | 89 | /* |
86 | * Probe for the NAND device. | 90 | * Probe for the NAND device. |
87 | */ | 91 | */ |
@@ -151,6 +155,12 @@ static int __init at91_nand_probe(struct platform_device *pdev) | |||
151 | #ifdef CONFIG_MTD_PARTITIONS | 155 | #ifdef CONFIG_MTD_PARTITIONS |
152 | if (host->board->partition_info) | 156 | if (host->board->partition_info) |
153 | partitions = host->board->partition_info(mtd->size, &num_partitions); | 157 | partitions = host->board->partition_info(mtd->size, &num_partitions); |
158 | #ifdef CONFIG_MTD_CMDLINE_PARTS | ||
159 | else { | ||
160 | mtd->name = "at91_nand"; | ||
161 | num_partitions = parse_mtd_partitions(mtd, part_probes, &partitions, 0); | ||
162 | } | ||
163 | #endif | ||
154 | 164 | ||
155 | if ((!partitions) || (num_partitions == 0)) { | 165 | if ((!partitions) || (num_partitions == 0)) { |
156 | printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n"); | 166 | printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n"); |