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/input/wacom.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/usb/input/wacom.c')
| -rw-r--r-- | drivers/usb/input/wacom.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c index dc099bbe12bf..48df4cfd5a42 100644 --- a/drivers/usb/input/wacom.c +++ b/drivers/usb/input/wacom.c | |||
| @@ -945,7 +945,6 @@ static void wacom_disconnect(struct usb_interface *intf) | |||
| 945 | } | 945 | } |
| 946 | 946 | ||
| 947 | static struct usb_driver wacom_driver = { | 947 | static struct usb_driver wacom_driver = { |
| 948 | .owner = THIS_MODULE, | ||
| 949 | .name = "wacom", | 948 | .name = "wacom", |
| 950 | .probe = wacom_probe, | 949 | .probe = wacom_probe, |
| 951 | .disconnect = wacom_disconnect, | 950 | .disconnect = wacom_disconnect, |