/spare/repo/netdev-2.6 branch 'master'

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c
index 386595ee21c0..4276c24a5080 100644
--- a/drivers/usb/input/touchkitusb.c
+++ b/drivers/usb/input/touchkitusb.c
@@ -35,7 +35,7 @@
 #define DEBUG
 #endif
 #include <linux/usb.h>
-
+#include <linux/usb_input.h>
 
 #define TOUCHKIT_MIN_XC                 0x0
 #define TOUCHKIT_MAX_XC                 0x07ff
@@ -202,10 +202,7 @@ static int touchkit_probe(struct usb_interface *intf,
 
         touchkit->input.name = touchkit->name;
         touchkit->input.phys = touchkit->phys;
-        touchkit->input.id.bustype = BUS_USB;
-        touchkit->input.id.vendor = le16_to_cpu(udev->descriptor.idVendor);
-        touchkit->input.id.product = le16_to_cpu(udev->descriptor.idProduct);
-        touchkit->input.id.version = le16_to_cpu(udev->descriptor.bcdDevice);
+        usb_to_input_id(udev, &touchkit->input.id);
         touchkit->input.dev = &intf->dev;
 
         touchkit->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);