From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 9 Aug 2012 15:47:27 +0000 (+0100)
Subject: ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'
X-Git-Tag: v3.6-rc4~11^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f50c6c415d84c612094d9514a3df3d70ab30e3;p=pandora-kernel.git

ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'

The platform attempts to register platform device 'snd_soc_u8500'
which doesn't actually exist. Here we change the reference to the
correct one 'snd_soc_mop500'.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

Reading git-diff-tree failed