diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-24 00:53:21 -0400 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-24 01:42:12 -0400 |
| commit | 6fdf5392caa4c3cba65add0a4beec9f5eb96b723 (patch) | |
| tree | 336ba343889a1d720e09477c2ea88cd5f99a67b9 /drivers/cdrom | |
| parent | f38d87f566195d78bd70538d5c774758f2d926d3 (diff) | |
powerpc: don't duplicate name between vio_driver and device_driver
Just set the name field directly in the device_driver structure
contained in the vio_driver struct.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/viocd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 0829db58462f..255d24ad704b 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c | |||
| @@ -739,10 +739,12 @@ static struct vio_device_id viocd_device_table[] __devinitdata = { | |||
| 739 | 739 | ||
| 740 | MODULE_DEVICE_TABLE(vio, viocd_device_table); | 740 | MODULE_DEVICE_TABLE(vio, viocd_device_table); |
| 741 | static struct vio_driver viocd_driver = { | 741 | static struct vio_driver viocd_driver = { |
| 742 | .name = "viocd", | ||
| 743 | .id_table = viocd_device_table, | 742 | .id_table = viocd_device_table, |
| 744 | .probe = viocd_probe, | 743 | .probe = viocd_probe, |
| 745 | .remove = viocd_remove | 744 | .remove = viocd_remove, |
| 745 | .driver = { | ||
| 746 | .name = "viocd", | ||
| 747 | } | ||
| 746 | }; | 748 | }; |
| 747 | 749 | ||
| 748 | static int __init viocd_init(void) | 750 | static int __init viocd_init(void) |
