aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-12-22 12:25:34 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-22 12:25:34 -0800
commit2af10844eb6ed104f9505bf3a7ba3ceb02264f31 (patch)
tree8a00024ff525b22379ea90a78ac3222db5a73062 /drivers/usb/misc
parent73bc7d315f56e260071bdb5f15e25b53bddc1402 (diff)
parent90a8a73c06cc32b609a880d48449d7083327e11a (diff)
downloadvexpress-lsk-2af10844eb6ed104f9505bf3a7ba3ceb02264f31.tar.gz
USB: Merge 2.6.37-rc5 into usb-next
This is to resolve the conflict in the file, drivers/usb/gadget/composite.c that was due to a revert in Linus's tree needed for the 2.6.37 release. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/uss720.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 796e2f68f74..4ff21587ab0 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -3,7 +3,7 @@
/*
* uss720.c -- USS720 USB Parport Cable.
*
- * Copyright (C) 1999, 2005
+ * Copyright (C) 1999, 2005, 2010
* Thomas Sailer (t.sailer@alumni.ethz.ch)
*
* This program is free software; you can redistribute it and/or modify
@@ -776,6 +776,8 @@ static const struct usb_device_id uss720_table[] = {
{ USB_DEVICE(0x0557, 0x2001) },
{ USB_DEVICE(0x0729, 0x1284) },
{ USB_DEVICE(0x1293, 0x0002) },
+ { USB_DEVICE(0x1293, 0x0002) },
+ { USB_DEVICE(0x050d, 0x0002) },
{ } /* Terminating entry */
};