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 git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
ndfc.c
diff --git
a/drivers/mtd/nand/ndfc.c
b/drivers/mtd/nand/ndfc.c
index
98fd2bd
..
510554e
100644
(file)
--- a/
drivers/mtd/nand/ndfc.c
+++ b/
drivers/mtd/nand/ndfc.c
@@
-35,7
+35,7
@@
struct ndfc_controller {
struct ndfc_controller {
- struct
of
_device *ofdev;
+ struct
platform
_device *ofdev;
void __iomem *ndfcbase;
struct mtd_info mtd;
struct nand_chip chip;
void __iomem *ndfcbase;
struct mtd_info mtd;
struct nand_chip chip;
@@
-225,7
+225,7
@@
err:
return ret;
}
return ret;
}
-static int __devinit ndfc_probe(struct
of
_device *ofdev,
+static int __devinit ndfc_probe(struct
platform
_device *ofdev,
const struct of_device_id *match)
{
struct ndfc_controller *ndfc = &ndfc_ctrl;
const struct of_device_id *match)
{
struct ndfc_controller *ndfc = &ndfc_ctrl;
@@
-277,7
+277,7
@@
static int __devinit ndfc_probe(struct of_device *ofdev,
return 0;
}
return 0;
}
-static int __devexit ndfc_remove(struct
of
_device *ofdev)
+static int __devexit ndfc_remove(struct
platform
_device *ofdev)
{
struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev);
{
struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev);