← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/mtd/maps/nettel.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mtd/maps/nettel.c
383
383
                /* No BIOS regions when AMD boot */
384
384
                num_intel_partitions -= 2;
385
385
        }
386
 
        rc = add_mtd_partitions(intel_mtd, nettel_intel_partitions,
387
 
                num_intel_partitions);
 
386
        rc = mtd_device_register(intel_mtd, nettel_intel_partitions,
 
387
                                 num_intel_partitions);
388
388
#endif
389
389
 
390
390
        if (amd_mtd) {
391
 
                rc = add_mtd_partitions(amd_mtd, nettel_amd_partitions,
392
 
                        num_amd_partitions);
 
391
                rc = mtd_device_register(amd_mtd, nettel_amd_partitions,
 
392
                                         num_amd_partitions);
393
393
        }
394
394
 
395
395
#ifdef CONFIG_MTD_CFI_INTELEXT
419
419
        unregister_reboot_notifier(&nettel_notifier_block);
420
420
#endif
421
421
        if (amd_mtd) {
422
 
                del_mtd_partitions(amd_mtd);
 
422
                mtd_device_unregister(amd_mtd);
423
423
                map_destroy(amd_mtd);
424
424
        }
425
425
        if (nettel_mmcrp) {
432
432
        }
433
433
#ifdef CONFIG_MTD_CFI_INTELEXT
434
434
        if (intel_mtd) {
435
 
                del_mtd_partitions(intel_mtd);
 
435
                mtd_device_unregister(intel_mtd);
436
436
                map_destroy(intel_mtd);
437
437
        }
438
438
        if (nettel_intel_map.virt) {