Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / input / gtco.c

diff --git a/drivers/usb/input/gtco.c b/drivers/usb/input/gtco.c
index 75cce2a97d201a4f6c660de1749221b7397a8311..b2ca10f2fe0e48b74d8cf22739f8623561a09c7c 100644 (file)
--- a/drivers/usb/input/gtco.c
+++ b/drivers/usb/input/gtco.c
@@ -223,7 +223,7 @@ static void parse_hid_report_descriptor(struct gtco *device, char * report,
        __u32 oldval[TAG_GLOB_MAX];
 
        /* Debug stuff */
-       char  maintype='x';
+       char  maintype = 'x';
        char  globtype[12];
        int   indent = 0;
        char  indentstr[10] = "";
@@ -952,7 +952,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
 
        /* Set input device required ID information */
        usb_to_input_id(gtco->usbdev, &input_dev->id);
-       input_dev->cdev.dev = &usbinterface->dev;
+       input_dev->dev.parent = &usbinterface->dev;
 
        /* Setup the URB, it will be posted later on open of input device */
        endpoint = &usbinterface->altsetting[0].endpoint[0].desc;