ChangeSet 1.2181.4.75, 2005/03/24 16:11:28-08:00, [EMAIL PROTECTED]
[PATCH] USB Storage: Remove dup in unusual_devs
Matthew Dharm pointed out that your BK tree somehow got 2 versions of an
unusual_devs entry in it. One was from a patch in January and the other
was from an automerge.
I dug around in bk - which I find to be the most counter-intuitive
program in the world - and generated a patch against your latest BK
tree, and I've attached it. It just removes the dup.
Signed-off-by: Phil Dibowitz <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
unusual_devs.h | 8 --------
1 files changed, 8 deletions(-)
diff -Nru a/drivers/usb/storage/unusual_devs.h
b/drivers/usb/storage/unusual_devs.h
--- a/drivers/usb/storage/unusual_devs.h 2005-03-30 15:20:05 -08:00
+++ b/drivers/usb/storage/unusual_devs.h 2005-03-30 15:20:05 -08:00
@@ -634,14 +634,6 @@
US_SC_SCSI, US_PR_CB, NULL,
US_FL_SINGLE_LUN ),
-#ifdef CONFIG_USB_STORAGE_USBAT
-UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005,
- "Sandisk",
- "ImageMate SDDR-05b",
- US_SC_SCSI, US_PR_SCM_ATAPI, init_usbat,
- US_FL_SINGLE_LUN),
-#endif
-
UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100,
"Sandisk",
"ImageMate SDDR-12",
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
