diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
| commit | 6528209ba2c94f3a0ef946b7d808d9a15b30ec50 (patch) | |
| tree | c3c1b8bcf8ae19f411c53c2f199f923742bcc256 /drivers/usb/storage/usb.c | |
| parent | a056fb3687c40b8a1123de1586f491285cb5fb1f (diff) | |
| parent | f2ab2a127d480ee20caf8620440ccf13c014447a (diff) | |
Merge remote branch 'stable/linux-2.6.32.y' into 2.6.32-mantismedia/2.6.32-mantis
Diffstat (limited to 'drivers/usb/storage/usb.c')
| -rw-r--r-- | drivers/usb/storage/usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 33197fa2271..6ce1095d29d 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -1025,6 +1025,7 @@ static struct usb_driver usb_storage_driver = { .post_reset = usb_stor_post_reset, .id_table = usb_storage_usb_ids, .soft_unbind = 1, + .no_dynamic_id = 1, }; static int __init usb_stor_init(void) |