diff options
Diffstat (limited to 'arch/cris/arch-v10')
-rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index ed708e19d09e..a4bbdfd37bd8 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
@@ -372,7 +372,7 @@ static int __init init_axis_flash(void) | |||
372 | #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE | 372 | #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE |
373 | if (mymtd) { | 373 | if (mymtd) { |
374 | main_partition.size = mymtd->size; | 374 | main_partition.size = mymtd->size; |
375 | err = add_mtd_partitions(mymtd, &main_partition, 1); | 375 | err = mtd_device_register(mymtd, &main_partition, 1); |
376 | if (err) | 376 | if (err) |
377 | panic("axisflashmap: Could not initialize " | 377 | panic("axisflashmap: Could not initialize " |
378 | "partition for whole main mtd device!\n"); | 378 | "partition for whole main mtd device!\n"); |
@@ -382,10 +382,12 @@ static int __init init_axis_flash(void) | |||
382 | if (mymtd) { | 382 | if (mymtd) { |
383 | if (use_default_ptable) { | 383 | if (use_default_ptable) { |
384 | printk(KERN_INFO " Using default partition table.\n"); | 384 | printk(KERN_INFO " Using default partition table.\n"); |
385 | err = add_mtd_partitions(mymtd, axis_default_partitions, | 385 | err = mtd_device_register(mymtd, |
386 | NUM_DEFAULT_PARTITIONS); | 386 | axis_default_partitions, |
387 | NUM_DEFAULT_PARTITIONS); | ||
387 | } else { | 388 | } else { |
388 | err = add_mtd_partitions(mymtd, axis_partitions, pidx); | 389 | err = mtd_device_register(mymtd, axis_partitions, |
390 | pidx); | ||
389 | } | 391 | } |
390 | 392 | ||
391 | if (err) | 393 | if (err) |