projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (3193): Replace del_timer with del_timer_sync
[powerpc.git]
/
drivers
/
cdrom
/
viocd.c
diff --git
a/drivers/cdrom/viocd.c
b/drivers/cdrom/viocd.c
index
0829db5
..
b519178
100644
(file)
--- a/
drivers/cdrom/viocd.c
+++ b/
drivers/cdrom/viocd.c
@@
-46,9
+46,9
@@
#include <asm/vio.h>
#include <asm/scatterlist.h>
#include <asm/vio.h>
#include <asm/scatterlist.h>
-#include <asm/i
Series/HvT
ypes.h>
-#include <asm/i
Series/HvLpE
vent.h>
-#include <asm/i
S
eries/vio.h>
+#include <asm/i
series/hv_t
ypes.h>
+#include <asm/i
series/hv_lp_e
vent.h>
+#include <asm/i
s
eries/vio.h>
#define VIOCD_DEVICE "iseries/vcd"
#define VIOCD_DEVICE_DEVFS "iseries/vcd"
#define VIOCD_DEVICE "iseries/vcd"
#define VIOCD_DEVICE_DEVFS "iseries/vcd"
@@
-736,13
+736,16
@@
static struct vio_device_id viocd_device_table[] __devinitdata = {
{ "viocd", "" },
{ "", "" }
};
{ "viocd", "" },
{ "", "" }
};
-
MODULE_DEVICE_TABLE(vio, viocd_device_table);
MODULE_DEVICE_TABLE(vio, viocd_device_table);
+
static struct vio_driver viocd_driver = {
static struct vio_driver viocd_driver = {
- .name = "viocd",
.id_table = viocd_device_table,
.probe = viocd_probe,
.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)
};
static int __init viocd_init(void)