diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-24 00:20:51 +0400 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-24 00:20:51 +0400 |
| commit | 74d83b7eedab14e4b963a2220ff76f98fa6d4cb8 (patch) | |
| tree | ff4b10ebd9cf1a057c4b1a703732858a539faff7 /drivers/mtd/maps/ts5500_flash.c | |
| parent | 61db1802bf33bf027cd97ba3f79566b2b2fce5c6 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
| download | linux-74d83b7eedab14e4b963a2220ff76f98fa6d4cb8.tar.xz | |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/mtd/maps/ts5500_flash.c')
| -rw-r--r-- | drivers/mtd/maps/ts5500_flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/ts5500_flash.c b/drivers/mtd/maps/ts5500_flash.c index e02dfa9d4ddd..d1d671daf235 100644 --- a/drivers/mtd/maps/ts5500_flash.c +++ b/drivers/mtd/maps/ts5500_flash.c @@ -89,7 +89,7 @@ static int __init init_ts5500_map(void) } mymtd->owner = THIS_MODULE; - add_mtd_partitions(mymtd, ts5500_partitions, NUM_PARTITIONS); + mtd_device_register(mymtd, ts5500_partitions, NUM_PARTITIONS); return 0; @@ -102,7 +102,7 @@ err2: static void __exit cleanup_ts5500_map(void) { if (mymtd) { - del_mtd_partitions(mymtd); + mtd_device_unregister(mymtd); map_destroy(mymtd); } |