diff options
Diffstat (limited to 'drivers/sbus/char/uctrl.c')
-rw-r--r-- | drivers/sbus/char/uctrl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 2c56fd56ec63..5f253665a1da 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -382,7 +382,7 @@ static int __devinit uctrl_probe(struct of_device *op, | |||
382 | 382 | ||
383 | sbus_writel(UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK, &p->regs->uctrl_intr); | 383 | sbus_writel(UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK, &p->regs->uctrl_intr); |
384 | printk(KERN_INFO "%s: uctrl regs[0x%p] (irq %d)\n", | 384 | printk(KERN_INFO "%s: uctrl regs[0x%p] (irq %d)\n", |
385 | op->node->full_name, p->regs, p->irq); | 385 | op->dev.of_node->full_name, p->regs, p->irq); |
386 | uctrl_get_event_status(p); | 386 | uctrl_get_event_status(p); |
387 | uctrl_get_external_status(p); | 387 | uctrl_get_external_status(p); |
388 | 388 | ||
@@ -425,8 +425,11 @@ static const struct of_device_id uctrl_match[] = { | |||
425 | MODULE_DEVICE_TABLE(of, uctrl_match); | 425 | MODULE_DEVICE_TABLE(of, uctrl_match); |
426 | 426 | ||
427 | static struct of_platform_driver uctrl_driver = { | 427 | static struct of_platform_driver uctrl_driver = { |
428 | .name = "uctrl", | 428 | .driver = { |
429 | .match_table = uctrl_match, | 429 | .name = "uctrl", |
430 | .owner = THIS_MODULE, | ||
431 | .of_match_table = uctrl_match, | ||
432 | }, | ||
430 | .probe = uctrl_probe, | 433 | .probe = uctrl_probe, |
431 | .remove = __devexit_p(uctrl_remove), | 434 | .remove = __devexit_p(uctrl_remove), |
432 | }; | 435 | }; |