diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 11:06:46 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 11:06:46 +0100 |
commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /drivers/cdrom | |
parent | Merge branch 'master' of /usr/src/ntfs-2.6/ (diff) | |
parent | powerpc: import a fix from arch/ppc/mm/pgtable.c (diff) | |
download | linux-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.xz linux-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/cdrom')
-rw-r--r-- | drivers/cdrom/viocd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 0829db58462f..36f31d202223 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -736,13 +736,16 @@ static struct vio_device_id viocd_device_table[] __devinitdata = { { "viocd", "" }, { "", "" } }; - 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", + .owner = THIS_MODULE, + } }; static int __init viocd_init(void) |