diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 09:48:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 09:48:34 -0700 |
| commit | e0d7ff168a71299919f01500b3d507aae0c67513 (patch) | |
| tree | de2a7807ec5642e7389191e66d8c5d6d1249096a /drivers/usb/input/usbmouse.c | |
| parent | ca49a601c2b4b74e5cf57fef62122204d1982372 (diff) | |
| parent | 33fdfa97f2b3aab698ef849ec50dcc5102017f0a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/usb/input/usbmouse.c')
| -rw-r--r-- | drivers/usb/input/usbmouse.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c index 1ec41b5effe..4104dec847f 100644 --- a/drivers/usb/input/usbmouse.c +++ b/drivers/usb/input/usbmouse.c @@ -32,6 +32,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/usb.h> +#include <linux/usb_input.h> /* * Version Information @@ -171,10 +172,7 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_ mouse->dev.name = mouse->name; mouse->dev.phys = mouse->phys; - mouse->dev.id.bustype = BUS_USB; - mouse->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor); - mouse->dev.id.product = le16_to_cpu(dev->descriptor.idProduct); - mouse->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice); + usb_to_input_id(dev, &mouse->dev.id); mouse->dev.dev = &intf->dev; if (dev->manufacturer) |