diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2009-02-12 14:48:19 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:20:34 -0400 |
commit | a9fb6d05d59c9e118ad8c355adfdf88c970c61bc (patch) | |
tree | ef8a9767fe13084084e036b7a1192a714464b1aa /drivers/usb/storage/usb.c | |
parent | 2cbbf3576aa9eae9a92f2669f38a453b6cb8e956 (diff) |
usb-storage: make jumpshot a separate module
This patch (as1214) converts usb-storage's jumpshot subdriver into a
separate module.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/usb.c')
-rw-r--r-- | drivers/usb/storage/usb.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index a537b3513b9b..2ea57691a7ba 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c | |||
@@ -66,9 +66,6 @@ | |||
66 | #include "debug.h" | 66 | #include "debug.h" |
67 | #include "initializers.h" | 67 | #include "initializers.h" |
68 | 68 | ||
69 | #ifdef CONFIG_USB_STORAGE_JUMPSHOT | ||
70 | #include "jumpshot.h" | ||
71 | #endif | ||
72 | #ifdef CONFIG_USB_STORAGE_ONETOUCH | 69 | #ifdef CONFIG_USB_STORAGE_ONETOUCH |
73 | #include "onetouch.h" | 70 | #include "onetouch.h" |
74 | #endif | 71 | #endif |
@@ -601,15 +598,6 @@ static void get_transport(struct us_data *us) | |||
601 | us->transport_reset = usb_stor_Bulk_reset; | 598 | us->transport_reset = usb_stor_Bulk_reset; |
602 | break; | 599 | break; |
603 | 600 | ||
604 | #ifdef CONFIG_USB_STORAGE_JUMPSHOT | ||
605 | case US_PR_JUMPSHOT: | ||
606 | us->transport_name = "Lexar Jumpshot Control/Bulk"; | ||
607 | us->transport = jumpshot_transport; | ||
608 | us->transport_reset = usb_stor_Bulk_reset; | ||
609 | us->max_lun = 1; | ||
610 | break; | ||
611 | #endif | ||
612 | |||
613 | #ifdef CONFIG_USB_STORAGE_ALAUDA | 601 | #ifdef CONFIG_USB_STORAGE_ALAUDA |
614 | case US_PR_ALAUDA: | 602 | case US_PR_ALAUDA: |
615 | us->transport_name = "Alauda Control/Bulk"; | 603 | us->transport_name = "Alauda Control/Bulk"; |