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 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[pandora-kernel.git]
/
arch
/
mips
/
cavium-octeon
/
flash_setup.c
diff --git
a/arch/mips/cavium-octeon/flash_setup.c
b/arch/mips/cavium-octeon/flash_setup.c
index
975c203
..
0a430e0
100644
(file)
--- a/
arch/mips/cavium-octeon/flash_setup.c
+++ b/
arch/mips/cavium-octeon/flash_setup.c
@@
-17,8
+17,6
@@
static struct map_info flash_map;
static struct mtd_info *mymtd;
static struct map_info flash_map;
static struct mtd_info *mymtd;
-static int nr_parts;
-static struct mtd_partition *parts;
static const char *part_probe_types[] = {
"cmdlinepart",
#ifdef CONFIG_MTD_REDBOOT_PARTS
static const char *part_probe_types[] = {
"cmdlinepart",
#ifdef CONFIG_MTD_REDBOOT_PARTS
@@
-61,11
+59,8
@@
static int __init flash_init(void)
mymtd = do_map_probe("cfi_probe", &flash_map);
if (mymtd) {
mymtd->owner = THIS_MODULE;
mymtd = do_map_probe("cfi_probe", &flash_map);
if (mymtd) {
mymtd->owner = THIS_MODULE;
-
- nr_parts = parse_mtd_partitions(mymtd,
- part_probe_types,
- &parts, 0);
- mtd_device_register(mymtd, parts, nr_parts);
+ mtd_device_parse_register(mymtd, part_probe_types,
+ 0, NULL, 0);
} else {
pr_err("Failed to register MTD device for flash\n");
}
} else {
pr_err("Failed to register MTD device for flash\n");
}