Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore

[~andy/linux] / drivers / usb / gadget / hid.c

diff --git a/drivers/usb/gadget/hid.c b/drivers/usb/gadget/hid.c
index 0e2e357cc59e4db57db1fb51b99d0952423acd56..74130f6c12c0f2bdc2669ca57b07e8f025efdaeb 100644 (file)
--- a/drivers/usb/gadget/hid.c
+++ b/drivers/usb/gadget/hid.c
@@ -15,6 +15,8 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/list.h>
+#include <linux/module.h>
+#include <linux/usb/composite.h>
 
 #include "gadget_chips.h"
 #define DRIVER_DESC            "HID Gadget"
@@ -34,9 +36,6 @@
  * the runtime footprint, and giving us at least some parts of what
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
-
-#include "composite.c"
-
 #include "f_hid.c"
 
 
@@ -144,7 +143,7 @@ static int __init hid_bind(struct usb_composite_dev *cdev)
 {
        struct usb_gadget *gadget = cdev->gadget;
        struct list_head *tmp;
-       int status, gcnum, funcs = 0;
+       int status, funcs = 0;
 
        list_for_each(tmp, &hidg_func_list)
                funcs++;
@@ -157,12 +156,6 @@ static int __init hid_bind(struct usb_composite_dev *cdev)
        if (status < 0)
                return status;
 
-       gcnum = usb_gadget_controller_number(gadget);
-       if (gcnum >= 0)
-               device_desc.bcdDevice = cpu_to_le16(0x0300 | gcnum);
-       else
-               device_desc.bcdDevice = cpu_to_le16(0x0300 | 0x0099);
-
        /* Allocate string descriptor numbers ... note that string
         * contents can be overridden by the composite_dev glue.
         */