diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/usb/input/usbmouse.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/input/usbmouse.c')
| -rw-r--r-- | drivers/usb/input/usbmouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c index 446935b671d9..0fb792be95ef 100644 --- a/drivers/usb/input/usbmouse.c +++ b/drivers/usb/input/usbmouse.c | |||
| @@ -218,7 +218,7 @@ static void usb_mouse_disconnect(struct usb_interface *intf) | |||
| 218 | 218 | ||
| 219 | static struct usb_device_id usb_mouse_id_table [] = { | 219 | static struct usb_device_id usb_mouse_id_table [] = { |
| 220 | { USB_INTERFACE_INFO(3, 1, 2) }, | 220 | { USB_INTERFACE_INFO(3, 1, 2) }, |
| 221 | { } /* Terminating entry */ | 221 | { } /* Terminating entry */ |
| 222 | }; | 222 | }; |
| 223 | 223 | ||
| 224 | MODULE_DEVICE_TABLE (usb, usb_mouse_id_table); | 224 | MODULE_DEVICE_TABLE (usb, usb_mouse_id_table); |