[GIT PULL] genesis updates for 2.6.37-rc1

Russell King - ARM Linux linux at arm.linux.org.uk
Thu Oct 28 06:09:12 EDT 2010

On Mon, Oct 25, 2010 at 10:48:25AM +0900, Paul Mundt wrote:
> Please pull from:
> 	master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6.git

I'm seeing a merge conflict against current mainline.  I'm not convinced
that there's a simple solution to this - it looks to me like the
snd_soc_register_codec() is not correctly placed here - as the codec
code references the hdmi data structure, but it's registered before the
hdmi data structure is setup.

More information about the linux-arm-kernel mailing list