diff options
Diffstat (limited to 'sound/sparc/dbri.c')
-rw-r--r-- | sound/sparc/dbri.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 2eab6ce48852..1557bf132e73 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -2651,7 +2651,7 @@ static int __devinit dbri_probe(struct of_device *op, const struct of_device_id | |||
2651 | 2651 | ||
2652 | printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n", | 2652 | printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n", |
2653 | dev, dbri->regs, | 2653 | dev, dbri->regs, |
2654 | dbri->irq, op->node->name[9], dbri->mm.version); | 2654 | dbri->irq, op->dev.of_node->name[9], dbri->mm.version); |
2655 | dev++; | 2655 | dev++; |
2656 | 2656 | ||
2657 | return 0; | 2657 | return 0; |
@@ -2687,8 +2687,11 @@ static const struct of_device_id dbri_match[] = { | |||
2687 | MODULE_DEVICE_TABLE(of, dbri_match); | 2687 | MODULE_DEVICE_TABLE(of, dbri_match); |
2688 | 2688 | ||
2689 | static struct of_platform_driver dbri_sbus_driver = { | 2689 | static struct of_platform_driver dbri_sbus_driver = { |
2690 | .name = "dbri", | 2690 | .driver = { |
2691 | .match_table = dbri_match, | 2691 | .name = "dbri", |
2692 | .owner = THIS_MODULE, | ||
2693 | .of_match_table = dbri_match, | ||
2694 | }, | ||
2692 | .probe = dbri_probe, | 2695 | .probe = dbri_probe, |
2693 | .remove = __devexit_p(dbri_remove), | 2696 | .remove = __devexit_p(dbri_remove), |
2694 | }; | 2697 | }; |