The patch titled ieee1394: sbp2: make TSB42AA9 workaround specific to Momobay CX-1 has been added to the -mm tree. Its filename is ieee1394-sbp2-make-tsb42aa9-workaround-specific.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ieee1394: sbp2: make TSB42AA9 workaround specific to Momobay CX-1 From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> The workarounds are not required for DViCO Momobay FX-3A and AFAIR not for Momobay CX-2. These contain an TSB42AA9A but feature the same firmware_revision value as the older DViCO Momobay CX-1. Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx> Cc: Ben Collins <bcollins@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ieee1394/sbp2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/ieee1394/sbp2.c~ieee1394-sbp2-make-tsb42aa9-workaround-specific drivers/ieee1394/sbp2.c --- 25/drivers/ieee1394/sbp2.c~ieee1394-sbp2-make-tsb42aa9-workaround-specific Fri Jun 2 14:43:43 2006 +++ 25-akpm/drivers/ieee1394/sbp2.c Fri Jun 2 14:43:43 2006 @@ -306,8 +306,9 @@ static const struct { u32 model_id; unsigned workarounds; } sbp2_workarounds_table[] = { - /* TSB42AA9 */ { + /* DViCO Momobay CX-1 with TSB42AA9 bridge */ { .firmware_revision = 0x002800, + .model_id = 0x001010, .workarounds = SBP2_WORKAROUND_INQUIRY_36 | SBP2_WORKAROUND_MODE_SENSE_8, }, _ Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are ieee1394-ohci1394c-function-calls-without.patch ieee1394-sbp2-make-tsb42aa9-workaround-specific.patch ieee1394-raw1394-fix-whitespace-after-x86_64.patch ieee1394-ieee1394-ohci1394-cycletoolong.patch ieee1394-ieee1394-support-for-slow-links-or-slow.patch ieee1394-ieee1394-save-ram-by-using-a-single.patch ieee1394-sbp2-remove-manipulation-of-inquiry.patch ieee1394-sbp2-log-number-of-supported-concurrent.patch ieee1394-ieee1394-extend-lowlevel-api-for.patch ieee1394-ohci1394-set-address-range-properties.patch ieee1394-ohci1394-make-phys_dma-parameter.patch ieee1394-sbp2-sbp2-remove-ohci1394-specific.patch ieee1394-sbp2-fix-s800-transfers-if-phys_dma-is.patch ieee1394-update-feature-removal-of-obsolete.patch ieee1394-sbp2-provide-helptext-for.patch ieee1394-sbp2-use-__attribute__packed-for.patch ieee1394-speed-up-of-dma_region_sync_for_cpu.patch ieee1394_core-switch-to-kthread-api.patch eth1394-endian-fixes.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html