This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / gadget / zero.c

diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index c439eb0..a415a33 100644 (file)
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -396,7 +396,7 @@ static const struct usb_descriptor_header *hs_loopback_function [] = {
 
 #endif /* !CONFIG_USB_GADGET_DUALSPEED */
 
-static char                            manufacturer [50];
+static char                            manufacturer [40];
 static char                            serial [40];
 
 /* static strings, in UTF-8 */
@@ -1188,10 +1188,6 @@ autoconf_fail:
                device_desc.bcdDevice = __constant_cpu_to_le16 (0x0208);
        } else if (gadget_is_lh7a40x(gadget)) {
                device_desc.bcdDevice = __constant_cpu_to_le16 (0x0209);
-       } else if (gadget_is_n9604(gadget)) {
-               device_desc.bcdDevice = __constant_cpu_to_le16 (0x0210);
-       } else if (gadget_is_pxa27x(gadget)) {
-               device_desc.bcdDevice = __constant_cpu_to_le16 (0x0211);
        } else {
                /* gadget zero is so simple (for now, no altsettings) that
                 * it SHOULD NOT have problems with bulk-capable hardware.