The patch titled sbp2: make TSB42AA9 workaround specific to Momobay CX-1 has been added to the -mm tree. Its filename is sbp2-make-tsb42aa9-workaround-specific-to-momobay-cx-1.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this 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~sbp2-make-tsb42aa9-workaround-specific-to-momobay-cx-1 drivers/ieee1394/sbp2.c --- devel/drivers/ieee1394/sbp2.c~sbp2-make-tsb42aa9-workaround-specific-to-momobay-cx-1 2006-04-14 21:53:09.000000000 -0700 +++ devel-akpm/drivers/ieee1394/sbp2.c 2006-04-14 21:53:09.000000000 -0700 @@ -300,8 +300,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-speed-up-of-dma_region_sync_for_cpu.patch drivers-ieee1394-ohci1394c-function-calls-without-effect.patch sbp2-consolidate-workarounds.patch sbp2-add-read_capacity-workaround-for-ipod.patch sbp2-make-tsb42aa9-workaround-specific-to-momobay-cx-1.patch sbp2-add-ability-to-override-hardwired-blacklist.patch dlm-device-interface-check-allocation.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