diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /drivers/usb/storage/sddr55.c | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'drivers/usb/storage/sddr55.c')
| -rw-r--r-- | drivers/usb/storage/sddr55.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c index e4ca5fcb7cc3..c144078065a7 100644 --- a/drivers/usb/storage/sddr55.c +++ b/drivers/usb/storage/sddr55.c | |||
| @@ -1006,6 +1006,7 @@ static struct usb_driver sddr55_driver = { | |||
| 1006 | .post_reset = usb_stor_post_reset, | 1006 | .post_reset = usb_stor_post_reset, |
| 1007 | .id_table = sddr55_usb_ids, | 1007 | .id_table = sddr55_usb_ids, |
| 1008 | .soft_unbind = 1, | 1008 | .soft_unbind = 1, |
| 1009 | .no_dynamic_id = 1, | ||
| 1009 | }; | 1010 | }; |
| 1010 | 1011 | ||
| 1011 | module_usb_driver(sddr55_driver); | 1012 | module_usb_driver(sddr55_driver); |