Merge 3.4-rc6 into usb-next

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

diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
index 15d41f2b3d6fcf25bc9a08edabed1f8f9c5c2ecc..35e9c51e66962af08162b5e07022735f7470a4a4 100644 (file)
--- a/drivers/usb/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
@@ -751,6 +751,7 @@ static struct usb_driver datafab_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     datafab_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(datafab_driver);