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
of: Remove duplicate fields from of_platform_driver
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
power.c
diff --git
a/arch/sparc/kernel/power.c
b/arch/sparc/kernel/power.c
index
e2a045c
..
168d4cb
100644
(file)
--- a/
arch/sparc/kernel/power.c
+++ b/
arch/sparc/kernel/power.c
@@
-41,9
+41,9
@@
static int __devinit power_probe(struct of_device *op, const struct of_device_id
power_reg = of_ioremap(res, 0, 0x4, "power");
printk(KERN_INFO "%s: Control reg at %llx\n",
power_reg = of_ioremap(res, 0, 0x4, "power");
printk(KERN_INFO "%s: Control reg at %llx\n",
- op->node->name, res->start);
+ op->
dev.of_
node->name, res->start);
- if (has_button_interrupt(irq, op->node)) {
+ if (has_button_interrupt(irq, op->
dev.of_
node)) {
if (request_irq(irq,
power_handler, 0, "power", NULL) < 0)
printk(KERN_ERR "power: Cannot setup IRQ handler.\n");
if (request_irq(irq,
power_handler, 0, "power", NULL) < 0)
printk(KERN_ERR "power: Cannot setup IRQ handler.\n");
@@
-60,10
+60,11
@@
static struct of_device_id __initdata power_match[] = {
};
static struct of_platform_driver power_driver = {
};
static struct of_platform_driver power_driver = {
- .match_table = power_match,
.probe = power_probe,
.probe = power_probe,
- .driver = {
- .name = "power",
+ .driver = {
+ .name = "power",
+ .owner = THIS_MODULE,
+ .of_match_table = power_match,
},
};
},
};