diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-23 20:20:44 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-23 20:21:03 +0400 |
| commit | c69263c66e5b2a5d0c7e5a41c189b1846ae1de92 (patch) | |
| tree | 81c6cf0f5b3b05739e2e73b0118077d9dd245182 /drivers/usb/storage/onetouch.c | |
| parent | 45196cee28a5bcfb6ddbe2bffa4270cbed66ae4b (diff) | |
| parent | 5407a3c3d942e75d4d123d213fd692bce5acc961 (diff) | |
| download | linux-c69263c66e5b2a5d0c7e5a41c189b1846ae1de92.tar.xz | |
Merge branch 'usb-3.3-rc4' into usb-next
This is to pull in the xhci changes and the other fixes and device id
updates that were done in Linus's tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage/onetouch.c')
| -rw-r--r-- | drivers/usb/storage/onetouch.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index d75155c38200..886567a3806d 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c @@ -312,6 +312,7 @@ static struct usb_driver onetouch_driver = { .post_reset = usb_stor_post_reset, .id_table = onetouch_usb_ids, .soft_unbind = 1, + .no_dynamic_id = 1, }; module_usb_driver(onetouch_driver); |