I based it off the for-2.6.37 branch, so it has to apply as is. Can you tell me where the conflict is? On Aug 20, 2010, at 4:41 AM, "Mark Brown" <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > On Thu, Aug 19, 2010 at 03:26:58PM -0500, Timur Tabi wrote: >> 'struct of_device' no longer exists, and its functionality has been merged >> into platform_device. Update the MPC8610 HPCD audio drivers (fsl_ssi, fsl_dma, >> and mpc8610_hpcd) accordingly. >> >> Also add a #include for slab.h, which is now needed for kmalloc and kfree. >> >> Signed-off-by: Timur Tabi <timur@xxxxxxxxxxxxx> > > This doesn't apply against current for-2.6.37 (presumably as a result of > the merge up of 2.6.36-rc1) - could you check please? > _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
