summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-24 14:53:21 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-24 15:42:12 +1000
commit6fdf5392caa4c3cba65add0a4beec9f5eb96b723 (patch)
tree336ba343889a1d720e09477c2ea88cd5f99a67b9 /drivers/cdrom
parentf38d87f566195d78bd70538d5c774758f2d926d3 (diff)
downloadlinux-stable-6fdf5392caa4c3cba65add0a4beec9f5eb96b723.tar.gz
linux-stable-6fdf5392caa4c3cba65add0a4beec9f5eb96b723.tar.bz2
linux-stable-6fdf5392caa4c3cba65add0a4beec9f5eb96b723.zip
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.c6
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 = {
MODULE_DEVICE_TABLE(vio, viocd_device_table);
static struct vio_driver viocd_driver = {
- .name = "viocd",
.id_table = viocd_device_table,
.probe = viocd_probe,
- .remove = viocd_remove
+ .remove = viocd_remove,
+ .driver = {
+ .name = "viocd",
+ }
};
static int __init viocd_init(void)