aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2005-09-30 07:58:13 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:47:43 -0400
commit094ec604721ed2a9a7ed6dfe40fd699b2f53a4c3 (patch)
treee689462fdaa7ce4acec8b333261927a7761121ff
parentb7b1e65588b8576c66a429a2623c91504efcf751 (diff)
[PATCH] usb-storage: Readd missing SDDR-05b unusual_devs entry
Just noticed that the SDDR-05b entry is missing for the shuttle_usbat driver. Looking through BK history it was removed in this patch: http://linux.bkbits.net:8080/linux-2.6/gnupatch@42435730FZQ2XCA6Qv5GPGD4pC4laQ However, at merge time, it looks like the duplicate was already removed, compare these two revisions: http://linux.bkbits.net:8080/linux-2.6/anno/drivers/usb/storage/unusual_devs.h@1.152 http://linux.bkbits.net:8080/linux-2.6/anno/drivers/usb/storage/unusual_devs.h@1.153 Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/storage/unusual_devs.h | 8 ++++++++ 1 file changed, 8 insertions(+)
-rw-r--r--drivers/usb/storage/unusual_devs.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 71d051d97b77..ee9f0502e055 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -702,6 +702,14 @@ UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200,
702 US_SC_SCSI, US_PR_CB, NULL, 702 US_SC_SCSI, US_PR_CB, NULL,
703 US_FL_SINGLE_LUN ), 703 US_FL_SINGLE_LUN ),
704 704
705#ifdef CONFIG_USB_STORAGE_USBAT
706UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005,
707 "Sandisk",
708 "ImageMate SDDR-05b",
709 US_SC_SCSI, US_PR_USBAT, init_usbat,
710 US_FL_SINGLE_LUN ),
711#endif
712
705UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100, 713UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100,
706 "Sandisk", 714 "Sandisk",
707 "ImageMate SDDR-12", 715 "ImageMate SDDR-12",