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/input/yealink.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/input/yealink.c')
| -rw-r--r-- | drivers/usb/input/yealink.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c index f526aebea502..1bfc105ad4d6 100644 --- a/drivers/usb/input/yealink.c +++ b/drivers/usb/input/yealink.c | |||
| @@ -987,7 +987,6 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
| 987 | } | 987 | } |
| 988 | 988 | ||
| 989 | static struct usb_driver yealink_driver = { | 989 | static struct usb_driver yealink_driver = { |
| 990 | .owner = THIS_MODULE, | ||
| 991 | .name = "yealink", | 990 | .name = "yealink", |
| 992 | .probe = usb_probe, | 991 | .probe = usb_probe, |
| 993 | .disconnect = usb_disconnect, | 992 | .disconnect = usb_disconnect, |