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/misc/idmouse.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/usb/misc/idmouse.c')
| -rw-r--r-- | drivers/usb/misc/idmouse.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 1dc3e0f73014..d8cde1017985 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
| @@ -114,7 +114,6 @@ static struct usb_class_driver idmouse_class = { | |||
| 114 | 114 | ||
| 115 | /* usb specific object needed to register this driver with the usb subsystem */ | 115 | /* usb specific object needed to register this driver with the usb subsystem */ |
| 116 | static struct usb_driver idmouse_driver = { | 116 | static struct usb_driver idmouse_driver = { |
| 117 | .owner = THIS_MODULE, | ||
| 118 | .name = DRIVER_SHORT, | 117 | .name = DRIVER_SHORT, |
| 119 | .probe = idmouse_probe, | 118 | .probe = idmouse_probe, |
| 120 | .disconnect = idmouse_disconnect, | 119 | .disconnect = idmouse_disconnect, |