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 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
gpio.c
diff --git
a/drivers/mtd/nand/gpio.c
b/drivers/mtd/nand/gpio.c
index
0cde618
..
2c2060b
100644
(file)
--- a/
drivers/mtd/nand/gpio.c
+++ b/
drivers/mtd/nand/gpio.c
@@
-316,8
+316,8
@@
static int __devinit gpio_nand_probe(struct platform_device *dev)
gpiomtd->plat.adjust_parts(&gpiomtd->plat,
gpiomtd->mtd_info.size);
gpiomtd->plat.adjust_parts(&gpiomtd->plat,
gpiomtd->mtd_info.size);
-
add_mtd_partitions
(&gpiomtd->mtd_info, gpiomtd->plat.parts,
- gpiomtd->plat.num_parts);
+
mtd_device_register
(&gpiomtd->mtd_info, gpiomtd->plat.parts,
+
gpiomtd->plat.num_parts);
platform_set_drvdata(dev, gpiomtd);
return 0;
platform_set_drvdata(dev, gpiomtd);
return 0;