git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
drivers
/
mtd
/
maps
/
bcm963xx-flash.c
diff --git
a/drivers/mtd/maps/bcm963xx-flash.c
b/drivers/mtd/maps/bcm963xx-flash.c
index
1f30495
..
736ca10
100644
(file)
--- a/
drivers/mtd/maps/bcm963xx-flash.c
+++ b/
drivers/mtd/maps/bcm963xx-flash.c
@@
-21,6
+21,7
@@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/slab.h>
+#include <linux/module.h>
#include <linux/mtd/map.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/map.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@
-224,8
+225,8
@@
probe_ok:
goto err_probe;
}
goto err_probe;
}
- return
add_mtd_partitions
(bcm963xx_mtd_info, parsed_parts,
-
parsed_nr_parts);
+ return
mtd_device_register
(bcm963xx_mtd_info, parsed_parts,
+ parsed_nr_parts);
err_probe:
iounmap(bcm963xx_map.virt);
err_probe:
iounmap(bcm963xx_map.virt);
@@
-235,7
+236,7
@@
err_probe:
static int bcm963xx_remove(struct platform_device *pdev)
{
if (bcm963xx_mtd_info) {
static int bcm963xx_remove(struct platform_device *pdev)
{
if (bcm963xx_mtd_info) {
-
del_mtd_partitions
(bcm963xx_mtd_info);
+
mtd_device_unregister
(bcm963xx_mtd_info);
map_destroy(bcm963xx_mtd_info);
}
map_destroy(bcm963xx_mtd_info);
}