diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-01-05 22:25:13 -0500 |
| commit | fed8bf19ec20efc0641740b2d10aa589dbd6d1ab (patch) | |
| tree | c104a13c7b8cb7f4152b15729dc5aede7c063e91 /drivers/usb/media/vicam.c | |
| parent | e7c3aad53dba54d375b632f2a21b680546828dec (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/media/vicam.c')
| -rw-r--r-- | drivers/usb/media/vicam.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/media/vicam.c b/drivers/usb/media/vicam.c index 0bc0b1247a6b..1c73155c8d77 100644 --- a/drivers/usb/media/vicam.c +++ b/drivers/usb/media/vicam.c | |||
| @@ -1257,7 +1257,6 @@ static struct usb_device_id vicam_table[] = { | |||
| 1257 | MODULE_DEVICE_TABLE(usb, vicam_table); | 1257 | MODULE_DEVICE_TABLE(usb, vicam_table); |
| 1258 | 1258 | ||
| 1259 | static struct usb_driver vicam_driver = { | 1259 | static struct usb_driver vicam_driver = { |
| 1260 | .owner = THIS_MODULE, | ||
| 1261 | .name = "vicam", | 1260 | .name = "vicam", |
| 1262 | .probe = vicam_probe, | 1261 | .probe = vicam_probe, |
| 1263 | .disconnect = vicam_disconnect, | 1262 | .disconnect = vicam_disconnect, |