diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/usb/media/vicam.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
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, |