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/stv680.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/stv680.c')
| -rw-r--r-- | drivers/usb/media/stv680.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c index 0fd0fa9fec21..774038b352cd 100644 --- a/drivers/usb/media/stv680.c +++ b/drivers/usb/media/stv680.c | |||
| @@ -1477,7 +1477,6 @@ static void stv680_disconnect (struct usb_interface *intf) | |||
| 1477 | } | 1477 | } |
| 1478 | 1478 | ||
| 1479 | static struct usb_driver stv680_driver = { | 1479 | static struct usb_driver stv680_driver = { |
| 1480 | .owner = THIS_MODULE, | ||
| 1481 | .name = "stv680", | 1480 | .name = "stv680", |
| 1482 | .probe = stv680_probe, | 1481 | .probe = stv680_probe, |
| 1483 | .disconnect = stv680_disconnect, | 1482 | .disconnect = stv680_disconnect, |