On 29/06/11 08:30, Kukjin Kim wrote:
Mark Brown wrote:
For marketing reasons the part will be called WM8996. In order to avoid user confusion rename the driver to reflect this.
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
The cross tree issues make this difficult to merge as there's dependencies in both ASoC and Samsung trees - Kukjin, would you be OK with merging this via ALSA late on in the merge window after both Samsung and ASoC trees have merged?
Yes, it's ok to me :)
As a note, basically my tree will be sent to upstream via rmk during merge window so I'm not sure when it is merged.
I will have a go at constructing some branches which do the right thing and can be merged now (so a base rename patch then a merge of that into ASoC which deals with all the work that has been done in the driver this release cycle) but I wanted to get this first option out there now.
arch/arm/mach-s3c64xx/mach-crag6410.c | 18 +-
If required, Acked-by: Kukjin Kim kgene.kim@samsung.com
Acked-by: Liam Girdwood lrg@ti.com