Merge 3.4-rc6 into usb-next

[~andy/linux] / drivers / usb / storage / freecom.c

diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index fa161574847560f90e84549d45fc19856939ff62..042cf9ef3153e194c7474747b8a9aa74986ab0d9 100644 (file)
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -553,6 +553,7 @@ static struct usb_driver freecom_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     freecom_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(freecom_driver);