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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
pasemi_nand.c
diff --git
a/drivers/mtd/nand/pasemi_nand.c
b/drivers/mtd/nand/pasemi_nand.c
index
090a05c
..
f02af24
100644
(file)
--- a/
drivers/mtd/nand/pasemi_nand.c
+++ b/
drivers/mtd/nand/pasemi_nand.c
@@
-93,7
+93,7
@@
static int __devinit pasemi_nand_probe(struct of_device *ofdev,
const struct of_device_id *match)
{
struct pci_dev *pdev;
const struct of_device_id *match)
{
struct pci_dev *pdev;
- struct device_node *np = ofdev->node;
+ struct device_node *np = ofdev->
dev.of_
node;
struct resource res;
struct nand_chip *chip;
int err = 0;
struct resource res;
struct nand_chip *chip;
int err = 0;
@@
-221,8
+221,11
@@
MODULE_DEVICE_TABLE(of, pasemi_nand_match);
static struct of_platform_driver pasemi_nand_driver =
{
static struct of_platform_driver pasemi_nand_driver =
{
- .name = (char*)driver_name,
- .match_table = pasemi_nand_match,
+ .driver = {
+ .name = (char*)driver_name,
+ .owner = THIS_MODULE,
+ .of_match_table = pasemi_nand_match,
+ },
.probe = pasemi_nand_probe,
.remove = pasemi_nand_remove,
};
.probe = pasemi_nand_probe,
.remove = pasemi_nand_remove,
};